erp5_officejs: refactoring - moving code to utils gadget

bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_common_utils_js.js

@@ -27,6 +27,30 @@
     // declared methods
     /////////////////////////////////////////////////////////////////
 
+    .declareMethod("getFormInfo", function (form_definition) {
+      var child_gadget_url,
+        form_type,
+        action_category = form_definition.action_type;
+      switch (action_category) {
+      case 'object_list':
+        form_type = 'list';
+        child_gadget_url = 'gadget_erp5_pt_form_list.html';
+        break;
+      case 'object_dialog':
+        form_type = 'dialog';
+        child_gadget_url = 'gadget_erp5_pt_form_dialog.html';
+        break;
+      case 'object_jio_js_script':
+        form_type = 'dialog';
+        child_gadget_url = 'gadget_erp5_pt_form_dialog.html';
+        break;
+      default:
+        form_type = 'page';
+        child_gadget_url = 'gadget_erp5_pt_form_view_editable.html';
+      }
+      return [form_type, child_gadget_url];
+    })
+
     .declareMethod("createDocument", function (options) {
       var gadget = this,
         doc = {

bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_common_utils_js.xml

@@ -269,7 +269,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>975.39669.47531.23961</string> </value>
+                <value> <string>975.39673.49091.10956</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -287,7 +287,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1557436424.93</float>
+                        <float>1557436563.26</float>
                         <string>UTC</string>
                       </tuple>
                     </state>

bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.js

@@ -3,31 +3,6 @@
 (function (window, rJS, document) {
   "use strict";
 
-  // TODO: move this to common utils
-  function getFormInfo(form_definition) {
-    var child_gadget_url,
-      form_type,
-      action_category = form_definition.action_type;
-    switch (action_category) {
-    case 'object_list':
-      form_type = 'list';
-      child_gadget_url = 'gadget_erp5_pt_form_list.html';
-      break;
-    case 'object_dialog':
-      form_type = 'dialog';
-      child_gadget_url = 'gadget_erp5_pt_form_dialog.html';
-      break;
-    case 'object_jio_js_script':
-      form_type = 'dialog';
-      child_gadget_url = 'gadget_erp5_pt_form_dialog.html';
-      break;
-    default:
-      form_type = 'page';
-      child_gadget_url = 'gadget_erp5_pt_form_view_editable.html';
-    }
-    return [form_type, child_gadget_url];
-  }
-
   rJS(window)
 
     /////////////////////////////////////////////////////////////////
@@ -54,6 +29,7 @@
       var gadget = this,
         default_view = "jio_view",
         common_utils_gadget_url = "gadget_officejs_common_utils.html",
+        form_definition,
         gadget_utils,
         jio_document,
         portal_type,
@@ -83,9 +59,12 @@
           front_page = portal_type === parent_portal_type;
           return gadget_utils.getFormDefinition(portal_type, default_view);
         })
-        .push(function (form_definition) {
-          var form_info = getFormInfo(form_definition),
-            form_type = form_info[0],
+        .push(function (result) {
+          form_definition = result;
+          return gadget_utils.getFormInfo(form_definition);
+        })
+        .push(function (form_info) {
+          var form_type = form_info[0],
             child_gadget_url = form_info[1];
           return gadget.changeState({
             jio_key: options.jio_key,
@@ -103,8 +82,7 @@
 
     .onStateChange(function () {
       var fragment = document.createElement('div'),
-        gadget = this,
-        options;
+        gadget = this;
       while (this.element.firstChild) {
         this.element.removeChild(this.element.firstChild);
       }

bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.xml

@@ -225,7 +225,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>975.39482.5501.59630</string> </value>
+                <value> <string>975.39691.34802.60091</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -243,7 +243,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1557425018.64</float>
+                        <float>1557437553.02</float>
                         <string>UTC</string>
                       </tuple>
                     </state>

bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_handle_action_js.js

@@ -4,31 +4,6 @@
 (function (window, document, rJS, RSVP) {
   "use strict";
 
-  // TODO: move this to common utils
-  function getFormInfo(form_definition) {
-    var child_gadget_url,
-      form_type,
-      action_category = form_definition.action_type;
-    switch (action_category) {
-    case 'object_list':
-      form_type = 'list';
-      child_gadget_url = 'gadget_erp5_pt_form_list.html';
-      break;
-    case 'object_dialog':
-      form_type = 'dialog';
-      child_gadget_url = 'gadget_erp5_pt_form_dialog.html';
-      break;
-    case 'object_jio_js_script':
-      form_type = 'dialog';
-      child_gadget_url = 'gadget_erp5_pt_form_dialog.html';
-      break;
-    default:
-      form_type = 'page';
-      child_gadget_url = 'gadget_erp5_pt_form_view_editable.html';
-    }
-    return [form_type, child_gadget_url];
-  }
-
   rJS(window)
     /////////////////////////////////////////////////////////////////
     // Acquired methods
@@ -60,7 +35,7 @@
     })
 
     .declareMethod("render", function (options) {
-      var gadget = this, action_reference;
+      var gadget = this, action_reference, gadget_utils, form_definition;
       return RSVP.Queue()
         .push(function () {
           return RSVP.all([
@@ -68,19 +43,24 @@
             gadget.getUrlParameter('parent_relative_url'),
             gadget.getSetting('portal_type'),
             gadget.getSetting('parent_relative_url'),
-            gadget.getUrlParameter("action")
+            gadget.getUrlParameter("action"),
+            gadget.declareGadget("gadget_officejs_common_utils.html")
           ]);
         })
         .push(function (result) {
           action_reference = result[4];
           if (result[0] !== undefined) {options.portal_type = result[0]; } else {options.portal_type = result[2]; }
           if (result[1] !== undefined) {options.parent_relative_url = result[1]; } else {options.parent_relative_url = result[3]; }
+          gadget_utils = result[5];
           return gadget.getActionFormDefinition(action_reference);
         })
-        .push(function (form_definition) {
+        .push(function (result) {
+          form_definition = result;
+          return gadget_utils.getFormInfo(form_definition);
+        })
+        .push(function (form_info) {
           var fragment = document.createElement('div'),
             action_gadget_url,
-            form_info = getFormInfo(form_definition),
             form_type = form_info[0],
             child_gadget_url = form_info[1],
             valid_action = form_definition.action_type === "object_jio_js_script" &&

bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_handle_action_js.xml

@@ -269,7 +269,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>975.39668.29926.39628</string> </value>
+                <value> <string>975.39692.31170.31266</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -287,7 +287,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1557436203.22</float>
+                        <float>1557437551.19</float>
                         <string>UTC</string>
                       </tuple>
                     </state>