[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 4003 revid:dle@openerp...

bzr revid: dle@openerp.com-20140418151400-1g98vljq3cjv0czs

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index a6b5fa6..f2101b2 100644 (file)
--- 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 0ecd164..13a357a 100644 (file)
--- 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 9ccbdd2..db43cc0 100644 (file)
--- 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 7c9e871..77533c1 100644 (file)
--- 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