odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 4179 revid:dle@openerp.com-20140422150918-nxv2v4bcvi6u3v6g 

bzr revid: dle@openerp.com-20140417101315-2pjn31wb7ald3qe4
bzr revid: dle@openerp.com-20140417161003-g3mchwrucp6ab8tu
bzr revid: dle@openerp.com-20140422160712-iq4yur3jmw5n01ar
This commit is contained in:
Denis Ledoux 2014-04-22 18:07:12 +02:00
parent 1306bd11ad 6083ed4b46
commit 5ff7146e15
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/web/static/src/js/search.js
View File

@ -1602,8 +1602,11 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
return facetValue.get('label');
},
make_domain: function (name, operator, facetValue) {
if (operator === this.default_operator) {
switch(operator){
case this.default_operator:
return [[name, '=', facetValue.get('value')]];
case 'child_of':
return [[name, 'child_of', facetValue.get('value')]];
}
return this._super(name, operator, facetValue);
},

7
addons/web/static/src/js/view_form.js
View File

@ -730,8 +730,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
}
}
},
on_button_save: function() {
on_button_save: function(e) {
var self = this;
$(e.target).attr("disabled", true);
return this.save().done(function(result) {
self.trigger("save", result);
self.reload().then(function() {
@ -741,6 +742,8 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
parent.menu.do_reload_needaction();
}
});
}).always(function(){
$(e.target).attr("disabled", false);
});
},
on_button_cancel: function(event) {
@ -3306,7 +3309,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
self.display_value_backup = {};
self.render_value();
self.focus();
self.view.do_onchange(self);
self.trigger('changed_value');
});
});

5
addons/web_kanban/static/src/css/kanban.css
View File

@ -160,7 +160,10 @@
padding: 0px;
background: white;
}
.openerp .oe_kanban_view .oe_kanban_column {
.openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_column_cards {
height: 100%;
}
.openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_column_cards {
height: 100%;
}
.openerp .oe_kanban_view .oe_kanban_aggregates {

2
addons/web_kanban/static/src/css/kanban.sass
View File

@ -179,7 +179,7 @@
padding: 0px
background: #ffffff
.oe_kanban_column
.oe_kanban_column, .oe_kanban_column_cards
height: 100%
.oe_kanban_aggregates
padding: 0