1 files changed, 18 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js
index a3c7bcaaff3..78d8ea7c5d1 100644
--- a/addons/web/static/src/js/views/form_widgets.js
+++ b/addons/web/static/src/js/views/form_widgets.js
@@ -11,6 +11,7 @@ var Priority = require('web.Priority');
 var ProgressBar = require('web.ProgressBar');
 var Dialog = require('web.Dialog');
 var DomainSelector = require("web.DomainSelector");
+var DomainSelectorDialog = require("web.DomainSelectorDialog");
 var common = require('web.form_common');
 var formats = require('web.formats');
 var framework = require('web.framework');
@@ -400,11 +401,19 @@ var FieldDomain = common.AbstractField.extend(common.ReinitializeFieldMixin).ext
             e.preventDefault();
             this._showSelection();
         },
+        "click .o_form_field_domain_dialog_button": function (e) {
+            e.preventDefault();
+            this.openDomainDialog();
+        },
     },
     custom_events: {
         "domain_changed": function (e) {
+            if (this.options.in_dialog) return;
             this.set_value(this.domainSelector.getDomain(), true);
         },
+        "domain_selected": function (e) {
+            this.set_value(e.data.domain);
+        },
     },
     init: function () {
         this._super.apply(this, arguments);
@@ -412,6 +421,7 @@ var FieldDomain = common.AbstractField.extend(common.ReinitializeFieldMixin).ext
         this.valid = true;
         this.debug = session.debug;
         this.options = _.defaults(this.options || {}, {
+            in_dialog: false,
             model: undefined, // this option is mandatory !
             fs_filters: {}, // Field selector filters (to only show a subset of available fields @see FieldSelector)
         });
@@ -457,7 +467,7 @@ var FieldDomain = common.AbstractField.extend(common.ReinitializeFieldMixin).ext
                 this.domainSelector.destroy();
             }
             this.domainSelector = new DomainSelector(this, this.model, domain, {
-                readonly: this.get("effective_readonly"),
+                readonly: this.get("effective_readonly") || this.options.in_dialog,
                 fs_filters: this.options.fs_filters,
                 debugMode: session.debug,
             });
@@ -492,6 +502,13 @@ var FieldDomain = common.AbstractField.extend(common.ReinitializeFieldMixin).ext
             disable_multiple_selection: true,
         }).open();
     },
+    openDomainDialog: function () {
+        new DomainSelectorDialog(this, this.model, this.get("value"), {
+            readonly: this.get("effective_readonly"),
+            fs_filters: this.options.fs_filters,
+            debugMode: session.debug,
+        }).open();
+    },
 });
 
 var FieldDate = common.AbstractField.extend(common.ReinitializeFieldMixin, {