erp5_officejs: reuse controller common utils gadget

bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_local_controller_js.js

@@ -27,6 +27,7 @@
         jio_document,
         portal_type,
         parent_portal_type,
+        form_definition,
         current_version,
         index;
       current_version = window.location.href.replace(window.location.hash, "");
@@ -80,9 +81,11 @@
           return gadget_util.getFormDefinition(portal_type, app_view);
         })
         .push(function (result) {
-          return result;
+          form_definition = result;
+          return gadget_util.getViewAndActionDict(portal_type,
+                                                   options.jio_key);
         })
-        .push(function (form_definition) {
+        .push(function (view_action_dict) {
           return gadget.changeState({
             jio_key: options.jio_key,
             doc: jio_document,
@@ -90,7 +93,8 @@
             child_gadget_url: form_definition.child_gadget_url,
             form_definition: form_definition,
             form_type: form_definition.form_type,
-            view: options.view || app_view
+            view: options.view || app_view,
+            view_action_dict: view_action_dict
           });
         }, function (error) {
           // jio not found error
@@ -132,8 +136,7 @@
         })
         .push(function () {
           return gadget.updatePanel({
-            portal_type: gadget.state.portal_type,
-            jio_key: gadget.state.jio_key
+            view_action_dict: gadget.state.view_action_dict
           });
         });
     })

bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_local_controller_js.xml

@@ -228,7 +228,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>979.51851.2310.1706</string> </value>
+                <value> <string>979.53364.49548.7526</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -246,7 +246,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1573728851.76</float>
+                        <float>1573813846.58</float>
                         <string>UTC</string>
                       </tuple>
                     </state>

bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_ojs_panel_js.js

@@ -126,8 +126,7 @@
             workflow_list: workflow_list,
             view_list: view_list,
             global: true,
-            portal_type: options.portal_type,
-            jio_key: options.jio_key,
+            view_action_dict: options.view_action_dict || false,
             editable: options.editable || editable || false
           });
         });
@@ -275,19 +274,12 @@
         }
       }
 
-      if (modification_dict.hasOwnProperty("portal_type")) {
+      if (modification_dict.view_action_dict) {
         queue
           .push(function () {
-            return gadget.getDeclaredGadget("common_util");
-          })
-          .push(function (gadget_utils) {
-            return gadget_utils.getViewAndActionDict(modification_dict.portal_type,
-                                                     modification_dict.jio_key);
-          })
-          .push(function (view_action_dict) {
             return RSVP.all([
-              getElementList(gadget, view_action_dict.view_list),
-              getElementList(gadget, view_action_dict.action_list)
+              getElementList(gadget, modification_dict.view_action_dict.view_list),
+              getElementList(gadget, modification_dict.view_action_dict.action_list)
             ]);
           })
           .push(function (view_action_list) {

bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_ojs_panel_js.xml

@@ -225,7 +225,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>979.52132.14300.25702</string> </value>
+                <value> <string>979.53363.42676.49749</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -243,7 +243,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1573740764.23</float>
+                        <float>1573813797.82</float>
                         <string>UTC</string>
                       </tuple>
                     </state>

bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_panel_html.html

@@ -64,11 +64,6 @@
     <!-- custom script -->
     <script src="gadget_erp5_ojs_panel.js" type="text/javascript"></script>
 
-     <div data-gadget-url="gadget_officejs_common_util.html"
-            data-gadget-scope="common_util"
-            data-gadget-sandbox="public">
-    </div>
-
   </head>
   <body>
 

bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_panel_html.xml

@@ -229,7 +229,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>975.50798.33418.15411</string> </value>
+                <value> <string>979.53350.54566.5802</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -247,7 +247,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1573739234.08</float>
+                        <float>1573813812.11</float>
                         <string>UTC</string>
                       </tuple>
                     </state>