[MERGE] forward port of branch saas-11 up to ac50230

6 files changed, 25 insertions, 16 deletions

diff --git a/addons/web/static/src/js/control_panel.js b/addons/web/static/src/js/control_panel.js
index 24e94b94fbb..80744f243e9 100644
--- a/addons/web/static/src/js/control_panel.js
+++ b/addons/web/static/src/js/control_panel.js
@@ -66,6 +66,11 @@ var ControlPanel = Widget.extend({
             $switch_buttons: this.$('.o_cp_switch_buttons'),
         };
 
+        // Prevent the search dropdowns to close when clicking inside them
+        this.$el.on('click.bs.dropdown', '.oe-search-options .dropdown-menu', function (e) {
+            e.stopPropagation();
+        });
+
         // By default, hide the ControlPanel and remove its contents from the DOM
         this._toggle_visibility(false);
 
diff --git a/addons/web/static/src/js/framework/data_manager.js b/addons/web/static/src/js/framework/data_manager.js
index 73521e1a06d..29d6d585f6a 100644
--- a/addons/web/static/src/js/framework/data_manager.js
+++ b/addons/web/static/src/js/framework/data_manager.js
@@ -39,7 +39,9 @@ return core.Class.extend({
             }, this._invalidate.bind(this, this._cache.actions, key));
         }
  
-        return this._cache.actions[key];
+        return this._cache.actions[key].then(function (action) {
+            return $.extend(true, {}, action);
+        });
     },
 
     /**
diff --git a/addons/web/static/src/js/views/graph_widget.js b/addons/web/static/src/js/views/graph_widget.js
index ed528768329..017801c2297 100644
--- a/addons/web/static/src/js/views/graph_widget.js
+++ b/addons/web/static/src/js/views/graph_widget.js
@@ -165,7 +165,7 @@ return Widget.extend({
         var chart = nv.models.multiBarChart();
         var maxVal = _.max(values, function(v) {return v.y})
         chart.options({
-          margin: {left: 12 * String(maxVal && maxVal.y || 0).length},
+          margin: {left: 12 * String(maxVal && maxVal.y || 10000000).length},
           delay: 250,
           transition: 10,
           showLegend: _.size(data) <= MAX_LEGEND_LENGTH,
@@ -297,7 +297,7 @@ return Widget.extend({
         var chart = nv.models.lineChart();
         var maxVal = _.max(values, function(v) {return v.y})
         chart.options({
-          margin: {left: 12 * String(maxVal && maxVal.y || 0).length, right: 50},
+          margin: {left: 12 * String(maxVal && maxVal.y || 10000000).length, right: 50},
           useInteractiveGuideline: true,
           showLegend: _.size(data) <= MAX_LEGEND_LENGTH,
           showXAxis: true,
diff --git a/addons/web/static/src/js/widgets/sidebar.js b/addons/web/static/src/js/widgets/sidebar.js
index e2222526320..03997db6c36 100644
--- a/addons/web/static/src/js/widgets/sidebar.js
+++ b/addons/web/static/src/js/widgets/sidebar.js
@@ -103,13 +103,13 @@ var Sidebar = Widget.extend({
         _.each(['print','action','relate'], function(type) {
             var items = toolbar[type];
             if (items) {
-                for (var i = 0; i < items.length; i++) {
-                    items[i] = {
-                        label: items[i]['name'],
-                        action: items[i],
+                var actions = _.map(items, function (item) {
+                    return {
+                        label: item.name,
+                        action: item,
                     };
-                }
-                self.add_items(type=='print' ? 'print' : 'other', items);
+                });
+                self.add_items(type === 'print' ? 'print' : 'other', actions);
             }
         });
     },
@@ -218,4 +218,3 @@ var Sidebar = Widget.extend({
 return Sidebar;
 
 });
-
diff --git a/addons/web/static/src/less/navbar.less b/addons/web/static/src/less/navbar.less
index 50015db9955..5f3aff0b98f 100644
--- a/addons/web/static/src/less/navbar.less
+++ b/addons/web/static/src/less/navbar.less
@@ -6,7 +6,7 @@
     color: white;
     .box-shadow(0px 0px 8px @odoo-main-text-color);
 
-    > button {
+    > a, > button {
         float: left;
         width: @odoo-navbar-height - 2;
         height: @odoo-navbar-height - 2;
@@ -14,20 +14,23 @@
         padding: 0;
         line-height: @odoo-navbar-height - 2;
         background-color: transparent;
-        
+        text-align: center;
+        color: inherit;
+
         font-size: 18px;
         .user-select(none);
 
         &:hover, &:focus {
             background-color: @odoo-navbar-inverse-link-hover-bg;
+            color: inherit;
         }
         &:focus, &:active, &:focus:active {
             outline: none;
         }
+    }
 
-        &.o_menu_toggle {
-            margin-right: 5px;
-        }
+    > .o_menu_toggle {
+        margin-right: 5px;
     }
 
     > ul {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index ef53f8fb12c..663133491de 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -750,7 +750,7 @@
 <t t-name="FieldMany2ManyTag">
     <t t-foreach="elements" t-as="el">
         <span t-attf-class="badge dropdown #{'o_tag_color_' + (el['color'] || 0)}" t-att-data-color="(el['color'] || 0)" t-att-data-index="el_index" t-att-data-id="el['id']">
-            <span class="o_badge_text"><t t-raw="el['display_name']"/></span>
+            <span class="o_badge_text" t-attf-title="#{el['display_name']}"><t t-raw="el['display_name']"/></span>
             <span t-if="!readonly" class="fa fa-times o_delete"/>
         </span>
     </t>