diff options
| author | Christophe Simonis <chs@openerp.com> | 2014-04-22 11:47:27 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2014-04-22 11:47:27 +0200 |
| commit | 8a1b43be67e5fa46183b4cf694d8133220d8d64e (patch) | |
| tree | a3455882840b38ab4f0db22877659a4b651c6467 | |
| parent | 65c1b294b24dfbfa10bb6b13f908fc4986ad3e6c (diff) | |
| parent | b250c5f9f50df6d9b50e4fbeb2128c04247c0e44 (diff) | |
[MERGE] forward port of branch saas-4 up to revid 3981 dle@openerp.com-20140418151400-1g98vljq3cjv0czs
bzr revid: chs@openerp.com-20140422094727-7hi9bv3wm1bi0ov9
| -rw-r--r-- | addons/web/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 5 | ||||
| -rw-r--r-- | addons/web_kanban/static/src/css/kanban.css | 5 | ||||
| -rw-r--r-- | addons/web_kanban/static/src/css/kanban.sass | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index a6b5fa63918..f2101b27fd3 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -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('_'): diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index aabaf0ad827..21a34db0036 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -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) { diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 9ccbdd2a3f7..db43cc00586 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -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 { diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 7c9e8719629..77533c1182e 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -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 |