[MERGE] forward port branch 12.0 up to 6e5ac01160

Also contains fixes for previous forward-port.

addons/web/static/src/js/views/kanban/kanban_controller.js

@@ -211,7 +211,7 @@ var KanbanController = BasicController.extend({
     _onAddColumn: function (ev) {
         var self = this;
         this.mutex.exec(function () {
-            return self.model.createGroup(ev.data.value, this.handle).then(function () {
+            return self.model.createGroup(ev.data.value, self.handle).then(function () {
                 var state = self.model.get(self.handle, {raw: true});
                 var ids = _.pluck(state.data, 'res_id').filter(_.isNumber);
                 return self._resequenceColumns(ids);

addons/web/static/src/js/views/pivot/pivot_model.js

@@ -315,8 +315,8 @@ var PivotModel = AbstractModel.extend({
         if (!this.data.has_data) {
             return {
                 has_data: false,
-                colGroupBys: this.data.main_col.groupbys,
-                rowGroupBys:  this.data.main_row.groupbys,
+                colGroupBys: this.data.main_col.root.groupbys,
+                rowGroupBys:  this.data.main_row.root.groupbys,
                 measures: this.data.measures,
             };
         }

addons/web/static/tests/views/pivot_tests.js

@@ -952,46 +952,56 @@ QUnit.module('Views', {
         };
         pivot.reload(reloadParams);
 
-        assert.deepEqual(pivot.getContext(), {
-            pivot_column_groupby: ['customer'],
-            pivot_measures: ['foo'],
-            pivot_row_groupby: ['product_id'],
+        assert.deepEqual(pivot.getOwnedQueryParams(), {
+            context: {
+                pivot_column_groupby: ['customer'],
+                pivot_measures: ['foo'],
+                pivot_row_groupby: ['product_id'],
+            },
         }, "context should be correct");
 
         // Let's get rid of the rows groupBy
         pivot.$('tbody .o_pivot_header_cell_opened').click();
 
-        assert.deepEqual(pivot.getContext(), {
-            pivot_column_groupby: ['customer'],
-            pivot_measures: ['foo'],
-            pivot_row_groupby: [],
+        assert.deepEqual(pivot.getOwnedQueryParams(), {
+            context: {
+                pivot_column_groupby: ['customer'],
+                pivot_measures: ['foo'],
+                pivot_row_groupby: [],
+            },
         }, "context should be correct");
 
         // And now, get rid of the col groupby
         pivot.$('thead .o_pivot_header_cell_opened').click();
 
-        assert.deepEqual(pivot.getContext(), {
-            pivot_column_groupby: [],
-            pivot_measures: ['foo'],
-            pivot_row_groupby: [],
+        assert.deepEqual(pivot.getOwnedQueryParams(), {
+            context: {
+                pivot_column_groupby: [],
+                pivot_measures: ['foo'],
+                pivot_row_groupby: [],
+            },
         }, "context should be correct");
 
         pivot.$('tbody .o_pivot_header_cell_closed').click();
-        pivot.$('.o_pivot_field_menu li[data-field=product_id] a').click();
+        pivot.$('.o_pivot_field_menu .dropdown-item[data-field="product_id"]:first').click();
 
-        assert.deepEqual(pivot.getContext(), {
-            pivot_column_groupby: [],
-            pivot_measures: ['foo'],
-            pivot_row_groupby: ['product_id'],
+        assert.deepEqual(pivot.getOwnedQueryParams(), {
+            context: {
+                pivot_column_groupby: [],
+                pivot_measures: ['foo'],
+                pivot_row_groupby: ['product_id'],
+            },
         }, "context should be correct");
 
         pivot.$('thead .o_pivot_header_cell_closed').click();
-        pivot.$('.o_pivot_field_menu li[data-field=customer] a').click();
+        pivot.$('.o_pivot_field_menu .dropdown-item[data-field="customer"]:first').click();
 
-        assert.deepEqual(pivot.getContext(), {
-            pivot_column_groupby: ['customer'],
-            pivot_measures: ['foo'],
-            pivot_row_groupby: ['product_id'],
+        assert.deepEqual(pivot.getOwnedQueryParams(), {
+            context: {
+                pivot_column_groupby: ['customer'],
+                pivot_measures: ['foo'],
+                pivot_row_groupby: ['product_id'],
+            },
         }, "context should be correct");
 
         pivot.destroy();

addons/website/models/website.py

@@ -1253,7 +1253,7 @@ class WebsiteRedirect(models.Model):
     _order = "sequence, id"
     _rec_name = 'url_from'
 
-    redirect_type = fields.Selection([('301', 'Moved permanently (301)'), ('302', 'Moved temporarily (302)')], string='Redirection Type', required=True, default='301)
+    redirect_type = fields.Selection([('301', 'Moved permanently (301)'), ('302', 'Moved temporarily (302)')], string='Redirection Type', required=True, default='301')
     url_from = fields.Char('Redirect From', required=True)
     url_to = fields.Char('Redirect To', required=True)
     website_id = fields.Many2one('website', 'Website')