[erp5_only_office] use notifyChange in olap_wizard

bt5/erp5_only_office/SkinTemplateItem/portal_skins/erp5_only_office/onlyoffice.gadget.js.js

@@ -192,6 +192,18 @@ DocsAPI.DocEditor.version = function () {
             console.error(e);
           });
       }
+      if (scope === "xmlawizard") {
+        return this.getDeclaredGadget(scope)
+          .push(function (g) {
+            return g.getContent();
+          })
+          .push(function (data) {
+            console.log(JSON.stringify(data));
+          })
+          .push(undefined, function (e) {
+            console.error(e);
+          });
+      }
     })
     .allowPublicAcquisition("getRemoteSettings", function () {
       return this.jio_getAttachment('/', 'remote_settings.json', {format: 'json'})

bt5/erp5_only_office/SkinTemplateItem/portal_skins/erp5_only_office/onlyoffice/olap_wizard.js.js

@@ -103,16 +103,6 @@
     return queue;
   }
 
-  function print_content(gadget) {
-    return gadget.getDeclaredGadget("olap_wizard")
-      .push(function (g) {
-        return g.getContent();
-      })
-      .push(function (v) {
-        console.log(JSON.stringify(v));
-      });
-  }
-
   function discoverDimensions(schema, used_dimensions, opt) {
     return xmla_request_retry("discoverMDDimensions", opt)
       .push(undefined, function (error) {
@@ -364,7 +354,6 @@
         function rerender_once(connection_settings, sub_gadget) {
           return sub_gadget.getContent()
             .push(function (content) {
-              console.log(content);
               return generateChoiceSchema(connection_settings, used_diemensions, content);
             })
             .push(function (schema) {
@@ -376,7 +365,7 @@
             });
         }
 
-        queue
+        return queue
           .push(function () {
             return g.getDeclaredGadget("olap_wizard");
           })
@@ -392,7 +381,7 @@
               sub_gadget = arr[1];
             return rerender_once(connection_settings, sub_gadget)
               .push(function (changed) {
-                if (changed.length > 0) {
+                if (changed && changed.length > 0) {
                   if (changed.indexOf('/dimension') >= 0) {
                     return allRerender();
                   }
@@ -400,14 +389,10 @@
                 }
               })
               .push(function (changed) {
-                if (changed.length > 0) {
+                if (changed && changed.length > 0) {
                   return rerender_once(connection_settings, sub_gadget);
                 }
               });
-          })
-          .push(function () {
-            // return g.notifyChange();
-            return print_content(g);
           });
       }
 
@@ -420,7 +405,7 @@
             }));
           })
           .push(function () {
-            return [];
+            return g.notifyChange();
           });
       };
 
@@ -444,11 +429,13 @@
           if (relPath === "/dimension") {
             return allRerender();
           }
-          return rerender(s);
+          return rerender(s)
+            .push(function () {
+              return g.notifyChange();
+            });
         }
       }
-      // return g.notifyChange();
-      return print_content(g);
+      return g.notifyChange();
     })
     .allowPublicAcquisition("resolveExternalReference", function (arr) {
       var g = this,