[MERGE] forward port of branch 9.0 up to ddd3e08

3 files changed, 21 insertions, 8 deletions

diff --git a/addons/web/static/src/js/action_manager.js b/addons/web/static/src/js/action_manager.js
index ec3441eee4c..9f435bf2c6b 100644
--- a/addons/web/static/src/js/action_manager.js
+++ b/addons/web/static/src/js/action_manager.js
@@ -788,10 +788,15 @@ var ActionManager = Widget.extend({
         });
     },
     ir_actions_act_url: function (action) {
+        var url = action.url;
+        if (session.debug && url && url.length && url[0] === '/') {
+            url = $.param.querystring(url, 'debug');
+        }
+
         if (action.target === 'self') {
-            framework.redirect(action.url);
+            framework.redirect(url);
         } else {
-            window.open(action.url, '_blank');
+            window.open(url, '_blank');
         }
         return $.when();
     },
diff --git a/addons/web/static/src/js/framework/utils.js b/addons/web/static/src/js/framework/utils.js
index 087d4c73d65..38953138da9 100644
--- a/addons/web/static/src/js/framework/utils.js
+++ b/addons/web/static/src/js/framework/utils.js
@@ -411,6 +411,13 @@ var DropMisordered = Class.extend({
     },
 });
 
+function swap(array, elem1, elem2) {
+    var i1 = array.indexOf(elem1);
+    var i2 = array.indexOf(elem2);
+    array[i2] = elem1;
+    array[i1] = elem2;
+}
+
 
 return {
     divmod: divmod,
@@ -437,6 +444,7 @@ return {
     assert: assert,
     xor: xor,
     DropMisordered: DropMisordered,
+    swap: swap,
 };
 
 });
diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js
index 4d39d8df806..0f89396eed2 100644
--- a/addons/web/static/src/js/views/form_widgets.js
+++ b/addons/web/static/src/js/views/form_widgets.js
@@ -439,12 +439,12 @@ var FieldCharDomain = common.AbstractField.extend(common.ReinitializeFieldMixin,
             var domain = pyeval.eval('domain', this.get('value'));
             var ds = new data.DataSetStatic(self, model, self.build_context());
             ds.call('search_count', [domain]).then(function (results) {
-                self.$('.o_count').text(results + ' selected records');
+                self.$('.o_count').text(results + _t(' selected records'));
                 if (self.get('effective_readonly')) {
-                    self.$('button').text('See selection ');
+                    self.$('button').text(_t('See selection '));
                 }
                 else {
-                    self.$('button').text('Change selection ');
+                    self.$('button').text(_t('Change selection '));
                 }
                 self.$('button').append($("<span/>").addClass('fa fa-arrow-right'));
             });
@@ -453,9 +453,9 @@ var FieldCharDomain = common.AbstractField.extend(common.ReinitializeFieldMixin,
                 this.$('.o_debug_input').val(this.get('value'));
             }
         } else {
-            this.$('.o_count').text('No selected record');
+            this.$('.o_count').text(_t('No selected record'));
             var $arrow = this.$('button span').detach();
-            this.$('button').text('Select records ').append($("<span/>").addClass('fa fa-arrow-right'));
+            this.$('button').text(_('Select records ')).append($("<span/>").addClass('fa fa-arrow-right'));
         }
     },
     on_click: function(event) {
@@ -465,7 +465,7 @@ var FieldCharDomain = common.AbstractField.extend(common.ReinitializeFieldMixin,
         var dialog = new common.DomainEditorDialog(this, {
             res_model: this.options.model || this.field_manager.get_field_value(this.options.model_field),
             default_domain: this.get('value'),
-            title: this.get('effective_readonly') ? 'Selected records' : 'Select records...',
+            title: this.get('effective_readonly') ? _t('Selected records') : _t('Select records...'),
             readonly: this.get('effective_readonly'),
             disable_multiple_selection: this.get('effective_readonly'),
             no_create: this.get('effective_readonly'),