projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1c1e069
c8df9fc
)
[MERGE] forward port of branch saas-3 up to c8df9fc
author
Denis Ledoux
<dle@odoo.com>
Thu, 6 Nov 2014 15:30:33 +0000
(16:30 +0100)
committer
Denis Ledoux
<dle@odoo.com>
Thu, 6 Nov 2014 15:30:33 +0000
(16:30 +0100)
1
2
addons/web/static/src/js/view_form.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/web/static/src/js/view_form.js
index
92325a8
,
5607b8a
..
b733481
---
1
/
addons/web/static/src/js/view_form.js
---
2
/
addons/web/static/src/js/view_form.js
+++ b/
addons/web/static/src/js/view_form.js
@@@
-5779,12
-5457,9
+5779,10
@@@
instance.web.form.FieldMany2ManyBinaryM
this.fileupload_id = _.uniqueId('oe_fileupload_temp');
$(window).on(this.fileupload_id, _.bind(this.on_file_loaded, this));
},
- start: function() {
- this._super();
- instance.web.form.ReinitializeFieldMixin.start.call(this);
+ initialize_content: function() {
this.$el.on('change', 'input.oe_form_binary_file', this.on_file_change );
},
+ // WARNING: duplicated in 4 other M2M widgets
set_value: function(value_) {
value_ = value_ || [];
if (value_.length >= 1 && value_[0] instanceof Array) {