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

[MERGE] forward port of branch saas-4 up to revid 3981 dle@openerp.com-20140418151400-1g98vljq3cjv0czs 

bzr revid: chs@openerp.com-20140422094727-7hi9bv3wm1bi0ov9
This commit is contained in:
Christophe Simonis 2014-04-22 11:47:27 +02:00
parent 65c1b294b2 b250c5f9f5
commit 8a1b43be67
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web/controllers/main.py
View File

@ -1225,7 +1225,7 @@ class DataSet(http.Controller):
records = getattr(request.session.model(model), method)(*args, **kwargs)
for record in records:
record['display_name'] = \
names.get(record['id']) or "%s#%d" % (model, (record['id']))
names.get(record['id']) or "{0}#{1}".format(model, (record['id']))
return records
if method.startswith('_'):

5
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) {

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

@ -162,7 +162,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