[MERGE] forward port of branch saas-3 up to ea659cb

funky-i · Jun 24, 2015 · b8bf1e0 · b8bf1e0
2 parents 859eb25 + ea659cb
commit b8bf1e0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
@@ -199,7 +199,7 @@
                     <filter string="Pending" name="Pending" domain="[('state', '=','pending')]"/>
                     <filter string="Template" name="Template" domain="[('state', '=','template')]"/>
                     <separator/>
-                    <filter string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]"/>
+                    <filter string="Member" name="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]"/>
                     <filter string="Manager" domain="[('user_id','=',uid)]"/>
                     <separator/>
                     <filter string="New Mail" name="message_unread" domain="[('message_unread','=',True)]"/>

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
@@ -5734,6 +5734,17 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({
         this._super.apply(this, arguments);
         this.$el.find('input').eq(0).val('');
         this.set_filename('');
+    },
+    set_value: function(value_){
+        var changed = value_ !== this.get_value();
+        this._super.apply(this, arguments);
+        // Trigger value change if size is the same
+        if (!changed){
+            this.trigger("change:value", this, {
+                oldValue: value_,
+                newValue: value_
+            });
+        }
     }
 });
 

diff --git a/openerp/addons/base/ir/ir_attachment.py b/openerp/addons/base/ir/ir_attachment.py
@@ -162,6 +162,9 @@ def _data_get(self, cr, uid, ids, name, arg, context=None):
                 result[attach.id] = self._file_read(cr, uid, attach.store_fname, bin_size)
             else:
                 result[attach.id] = attach.db_datas
+                if bin_size:
+                    result[attach.id] = int(result[attach.id])
+
         return result
 
     def _data_set(self, cr, uid, id, name, value, arg, context=None):