Merge pull request #71 from gisce/hotfix/bug_webclient#388

Fix bug webclient#388
gisce · Nov 23, 2022 · 657020c · 657020c
2 parents 4e3ca1a + 77a11ee
commit 657020c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gisce/ooui",
-  "version": "0.17.10",
+  "version": "0.17.11",
   "main": "./dist/ooui.umd.js",
   "module": "./dist/ooui.es.js",
   "types": "./dist/index.d.ts",

diff --git a/src/Widget.ts b/src/Widget.ts
@@ -128,8 +128,12 @@ abstract class Widget {
       if (props.context) {
         this._context = props.context;
       }
-      if (props.domain && typeof props.domain === "string") {
-        this._domain = props.domain;
+      if (props.domain) {
+        if (typeof props.domain !== "string") {
+          this._domain = JSON.stringify(props.domain);
+        } else {
+          this._domain = props.domain;
+        }
       }
       if (props.widget_props) {
         try {

diff --git a/src/spec/Form.spec.ts b/src/spec/Form.spec.ts
@@ -3137,4 +3137,21 @@ describe("A Form", () => {
     const field = form.findById("bank") as Field;
     expect(field.readOnly).toBeFalsy();
   });
+  it("Should be able to parse domain in array format", () => {
+    const arch = `<form>
+        <field name="bank" />
+        </form>`;
+    const fields = {
+      bank: {
+        type: "many2one",
+        domain: [["category_id.name", "=", "ALQ ELEC"]],
+      },
+    };
+    const form = new Form(fields);
+    form.parse(arch, {
+      values: {},
+    });
+    const field = form.findById("bank") as Field;
+    expect(field.domain).toBeDefined();
+  });
 });