[MERGE] forward port branch saas-12.2 up to 8747d72f1ef

9 files changed, 97 insertions, 19 deletions

diff --git a/addons/web/static/lib/moment/locale/ar.js b/addons/web/static/lib/moment/locale/ar.js
index d263e4c4f8d..dbe4e7dd940 100644
--- a/addons/web/static/lib/moment/locale/ar.js
+++ b/addons/web/static/lib/moment/locale/ar.js
@@ -58,18 +58,18 @@ var pluralize = function (u) {
     };
 };
 var months = [
-    'كانون الثاني يناير',
-    'شباط فبراير',
-    'آذار مارس',
-    'نيسان أبريل',
-    'أيار مايو',
-    'حزيران يونيو',
-    'تموز يوليو',
-    'آب أغسطس',
-    'أيلول سبتمبر',
-    'تشرين الأول أكتوبر',
-    'تشرين الثاني نوفمبر',
-    'كانون الأول ديسمبر'
+    'يناير',
+    'فبراير',
+    'مارس',
+    'أبريل',
+    'مايو',
+    'يونيو',
+    'يوليو',
+    'أغسطس',
+    'سبتمبر',
+    'أكتوبر',
+    'نوفمبر',
+    'ديسمبر'
 ];
 
 var ar = moment.defineLocale('ar', {
diff --git a/addons/web/static/src/js/views/control_panel/search/add_new_favorite_menu.js b/addons/web/static/src/js/views/control_panel/search/add_new_favorite_menu.js
index 0a2498c69df..421fec3e04b 100644
--- a/addons/web/static/src/js/views/control_panel/search/add_new_favorite_menu.js
+++ b/addons/web/static/src/js/views/control_panel/search/add_new_favorite_menu.js
@@ -12,6 +12,7 @@ var AddNewFavoriteMenu = Widget.extend({
     events: _.extend({}, Widget.prototype.events, {
         'click .o_save_favorite': '_onSaveFavoriteClick',
         'click .o_add_favorite.o_menu_header': '_onMenuHeaderClick',
+        'click input[type="checkbox"]': '_onCheckboxClick',
         'keyup .o_save_name input': '_onKeyUp',
     }),
     /**
@@ -108,6 +109,33 @@ var AddNewFavoriteMenu = Widget.extend({
     //--------------------------------------------------------------------------
 
     /**
+     * Additional behavior when a checkbox is clicked upon
+     * Namely, some checkbox are mutually exclusive
+     * this function allows this
+     *
+     * @private
+     * @param {jQueryEvent} ev
+     */
+    _onCheckboxClick: function (ev) {
+        function mutuallyExclusive (elem) {
+            if (!elem.id) return false;
+            return ['use_by_default', 'share_all_users'].some(function (str) {
+                return elem.id.indexOf(str);
+            });
+        }
+        var $checkboxes = this.$('input[type="checkbox"]');
+        var currentCheckBox = ev.target;
+
+        if (mutuallyExclusive(currentCheckBox)) {
+            for (var i=0; i < $checkboxes.length; i++) {
+                var checkbox = $checkboxes[i];
+                if (checkbox !== currentCheckBox && mutuallyExclusive(checkbox)) {
+                    checkbox.checked = false;
+                }
+            }
+        }
+    },
+    /**
      * @private
      * @param {jQueryEvent} ev
      */
diff --git a/addons/web/static/src/js/views/pivot/pivot_controller.js b/addons/web/static/src/js/views/pivot/pivot_controller.js
index ac48ab769ff..fbc08e93b1e 100644
--- a/addons/web/static/src/js/views/pivot/pivot_controller.js
+++ b/addons/web/static/src/js/views/pivot/pivot_controller.js
@@ -53,7 +53,6 @@ var PivotController = AbstractController.extend({
      * @override
      */
     start: function () {
-        this.$el.toggleClass('o_enable_linking', this.enableLinking);
         this.$fieldSelection = this.$('.o_field_selection');
         core.bus.on('click', this, function () {
             this.$fieldSelection.empty();
diff --git a/addons/web/static/src/js/views/pivot/pivot_renderer.js b/addons/web/static/src/js/views/pivot/pivot_renderer.js
index 101f3734392..29c3424e141 100644
--- a/addons/web/static/src/js/views/pivot/pivot_renderer.js
+++ b/addons/web/static/src/js/views/pivot/pivot_renderer.js
@@ -283,7 +283,7 @@ var PivotRenderer = AbstractRenderer.extend({
                     $cell = $('<td>')
                                 .data('id', rows[i].id)
                                 .data('col_id', rows[i].col_ids[Math.floor(j / nbrMeasures)])
-                                .toggleClass('o_empty', !value)
+                                .toggleClass('o_empty', _.isUndefined(value))
                                 .addClass('o_pivot_cell_value text-right');
                     if (value !== undefined) {
                         $cell.append($('<div>', {class: 'o_value'}).html(formatter(value, measure)));
diff --git a/addons/web/static/src/js/widgets/pie_chart.js b/addons/web/static/src/js/widgets/pie_chart.js
index ddeca1fdcec..a9b0bc01e45 100644
--- a/addons/web/static/src/js/widgets/pie_chart.js
+++ b/addons/web/static/src/js/widgets/pie_chart.js
@@ -34,6 +34,11 @@ var PieChart = Widget.extend({
             title: node.attrs.title || modifiers.title || modifiers.measure,
         });
 
+        var pieChartContext = JSON.parse(JSON.stringify(record.context));
+        delete pieChartContext.graph_mode;
+        delete pieChartContext.graph_measure;
+        delete pieChartContext.graph_groupbys;
+
         this.subViewParams = {
             modelName: record.model,
             withControlPanel: false,
@@ -41,7 +46,7 @@ var PieChart = Widget.extend({
             mode: 'pie',
         };
         this.subViewParams.searchQuery = {
-            context: record.context,
+            context: pieChartContext,
             domain: domain,
             groupBy: [],
         };
diff --git a/addons/web/static/src/scss/pivot_view.scss b/addons/web/static/src/scss/pivot_view.scss
index 83f8fbc58e7..6bc25ee114e 100644
--- a/addons/web/static/src/scss/pivot_view.scss
+++ b/addons/web/static/src/scss/pivot_view.scss
@@ -87,4 +87,9 @@
         right: 6px;
         top: 9px;
     }
+
+    .o_pivot_field_menu .dropdown-item.disabled {
+        color: $text-muted;
+        cursor: default;
+    }
 }
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 564bbc8582e..c925809fab5 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -532,7 +532,7 @@
     </div>
 </div>
 
-<div t-name="PivotView" class="o_pivot">
+<div t-name="PivotView" t-attf-class="o_pivot #{widget.enableLinking ? 'o_enable_linking' : ''}">
     <div class="o_field_selection"/>
 </div>
 <t t-name="PivotView.buttons">
diff --git a/addons/web/static/tests/views/control_panel_tests.js b/addons/web/static/tests/views/control_panel_tests.js
index 2e0a369ab4a..7d033e5f1e4 100644
--- a/addons/web/static/tests/views/control_panel_tests.js
+++ b/addons/web/static/tests/views/control_panel_tests.js
@@ -418,6 +418,47 @@ QUnit.module('Views', {
         controlPanel.destroy();
     });
 
+    QUnit.test('Favorites Use by Default and Share are exclusive', async function (assert) {
+        assert.expect(11);
+        var controlPanel = await createControlPanel({
+            model: 'partner',
+            arch: "<search></search>",
+            data: this.data,
+            searchMenuTypes: ['favorite'],
+        });
+        testUtils.dom.click(controlPanel.$('.o_favorites_menu_button'));
+        testUtils.dom.click(controlPanel.$('button.o_add_favorite'));
+        var $checkboxes = controlPanel.$('input[type="checkbox"]');
+
+        assert.strictEqual($checkboxes.length, 2,
+            '2 checkboxes are present')
+
+        assert.notOk($checkboxes[0].checked, 'Start: None of the checkboxes are checked (1)');
+        assert.notOk($checkboxes[1].checked, 'Start: None of the checkboxes are checked (2)');
+
+        testUtils.dom.click($checkboxes.eq(0));
+        assert.ok($checkboxes[0].checked, 'The first checkbox is checked');
+        assert.notOk($checkboxes[1].checked, 'The second checkbox is not checked');
+
+        testUtils.dom.click($checkboxes.eq(1));
+        assert.notOk($checkboxes[0].checked,
+            'Clicking on the second checkbox checks it, and unchecks the first (1)');
+        assert.ok($checkboxes[1].checked,
+            'Clicking on the second checkbox checks it, and unchecks the first (2)');
+
+        testUtils.dom.click($checkboxes.eq(0));
+        assert.ok($checkboxes[0].checked,
+            'Clicking on the first checkbox checks it, and unchecks the second (1)');
+        assert.notOk($checkboxes[1].checked,
+            'Clicking on the first checkbox checks it, and unchecks the second (2)');
+
+        testUtils.dom.click($checkboxes.eq(0));
+        assert.notOk($checkboxes[0].checked, 'End: None of the checkboxes are checked (1)');
+        assert.notOk($checkboxes[1].checked, 'End: None of the checkboxes are checked (2)');
+
+        controlPanel.destroy();
+    });
+
     QUnit.test('load filter', async function (assert) {
         assert.expect(1);
 
diff --git a/addons/web/static/tests/views/pivot_tests.js b/addons/web/static/tests/views/pivot_tests.js
index acd8b11b635..0907e471b39 100644
--- a/addons/web/static/tests/views/pivot_tests.js
+++ b/addons/web/static/tests/views/pivot_tests.js
@@ -106,7 +106,7 @@ QUnit.module('Views', {
             },
         });
 
-        assert.hasClass(pivot.$el,'o_enable_linking',
+        assert.hasClass(pivot.$('.o_pivot'),'o_enable_linking',
             "root node should have classname 'o_enable_linking'");
         assert.strictEqual(pivot.$('td.o_pivot_cell_value:contains(32)').length, 1,
                     "should contain a pivot cell with the sum of all records");
@@ -269,7 +269,7 @@ QUnit.module('Views', {
             }
         });
 
-        assert.hasClass(pivot.$el,'o_enable_linking',
+        assert.hasClass(pivot.$('.o_pivot'),'o_enable_linking',
             "root node should have classname 'o_enable_linking'");
         await testUtils.dom.click(pivot.$('.o_pivot_cell_value:contains(12)')); // should trigger a do_action
 
@@ -293,7 +293,7 @@ QUnit.module('Views', {
             },
         });
 
-        assert.doesNotHaveClass(pivot.$el, 'o_enable_linking',
+        assert.doesNotHaveClass(pivot.$('.o_pivot'), 'o_enable_linking',
             "root node should not have classname 'o_enable_linking'");
         assert.containsOnce(pivot, '.o_pivot_cell_value',
             "should have one cell");