diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-06-24 12:34:03 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-06-24 12:34:03 +0200 |
| commit | ea659cbd87f185db247c1807d32ab0d4e3e04fe9 (patch) | |
| tree | efde9a1bad599afd4ce0c665c4d183abb42bb820 | |
| parent | 9cdfb0696a350d71f32fe7ac699679d40d2d28e2 (diff) | |
| parent | 16a545b1bafc89bc68d270bc77c5c5edddfb7367 (diff) | |
[MERGE] forward port of branch 7.0 up to 16a545b
| -rw-r--r-- | addons/project/project_view.xml | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 11 | ||||
| -rw-r--r-- | openerp/addons/base/ir/ir_attachment.py | 3 |
3 files changed, 15 insertions, 1 deletions
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 3a174f466d5..ce4ab508078 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -189,7 +189,7 @@ <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/> <filter icon="gtk-media-pause" string="Template" name="Template" domain="[('state', '=','template')]" help="Templates of Projects"/> <separator/> - <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/> + <filter icon="terp-personal+" string="Member" name="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/> <separator/> <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/> <field name="user_id" string="Project Manager"/> diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 1fc1297ee03..f360b1b7783 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -5390,6 +5390,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 index b78a233cf23..2ef2cd98a69 100644 --- a/openerp/addons/base/ir/ir_attachment.py +++ b/openerp/addons/base/ir/ir_attachment.py @@ -133,6 +133,9 @@ class ir_attachment(osv.osv): result[attach.id] = self._file_read(cr, uid, location, 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): |