[MERGE] forward port of branch saas-3 up to ea659cb
This commit is contained in:
commit
b8bf1e0905
|
@ -199,7 +199,7 @@
|
||||||
<filter string="Pending" name="Pending" domain="[('state', '=','pending')]"/>
|
<filter string="Pending" name="Pending" domain="[('state', '=','pending')]"/>
|
||||||
<filter string="Template" name="Template" domain="[('state', '=','template')]"/>
|
<filter string="Template" name="Template" domain="[('state', '=','template')]"/>
|
||||||
<separator/>
|
<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)]"/>
|
<filter string="Manager" domain="[('user_id','=',uid)]"/>
|
||||||
<separator/>
|
<separator/>
|
||||||
<filter string="New Mail" name="message_unread" domain="[('message_unread','=',True)]"/>
|
<filter string="New Mail" name="message_unread" domain="[('message_unread','=',True)]"/>
|
||||||
|
|
|
@ -5734,6 +5734,17 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({
|
||||||
this._super.apply(this, arguments);
|
this._super.apply(this, arguments);
|
||||||
this.$el.find('input').eq(0).val('');
|
this.$el.find('input').eq(0).val('');
|
||||||
this.set_filename('');
|
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_
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -162,6 +162,9 @@ class ir_attachment(osv.osv):
|
||||||
result[attach.id] = self._file_read(cr, uid, attach.store_fname, bin_size)
|
result[attach.id] = self._file_read(cr, uid, attach.store_fname, bin_size)
|
||||||
else:
|
else:
|
||||||
result[attach.id] = attach.db_datas
|
result[attach.id] = attach.db_datas
|
||||||
|
if bin_size:
|
||||||
|
result[attach.id] = int(result[attach.id])
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def _data_set(self, cr, uid, id, name, value, arg, context=None):
|
def _data_set(self, cr, uid, id, name, value, arg, context=None):
|
||||||
|
|
Loading…
Reference in New Issue