Revert "[erp5_web_renderjs_ui] Use RSVP.hash"

This reverts commit 42f37e39.

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.js

@@ -20,7 +20,7 @@
    */
   function modifyBreadcrumbList(gadget, parent_link, breadcrumb_action_list) {
     if (parent_link === undefined) {
-      return breadcrumb_action_list;
+      return;
     }
     var uri = new URI(parent_link.href),
       jio_key = uri.segment(2);
@@ -31,7 +31,7 @@
         title: "ERP5",
         link: "#"
       });
-      return breadcrumb_action_list;
+      return;
     }
 
     // Parent is an ERP5 document
@@ -78,66 +78,77 @@
 
     .onStateChange(function () {
       var gadget = this,
-        erp5_document;
+        view_list = [],
+        tab_list = [],
+        jump_action_list = [],
+        breadcrumb_action_list = [],
+        erp5_document,
+        tab_title = "Views",
+        tab_icon = "eye",
+        jump_list;
 
       return gadget.jio_getAttachment(gadget.state.jio_key, "links")
         .push(function (result) {
-          erp5_document = result;
-
           var i,
-            tab_promise_list = [],
-            jump_action_promise_list = [],
-            view_list = ensureArray(erp5_document._links.view)
-              .concat(ensureArray(erp5_document._links.action_object_jio_view)),
+            promise_list = [];
+          erp5_document = result;
+          view_list = ensureArray(erp5_document._links.view);
           jump_list = ensureArray(erp5_document._links.action_object_jump);
 
           for (i = 0; i < view_list.length; i += 1) {
-            tab_promise_list.push(RSVP.hash({
-              title: view_list[i].title,
-              i18n: view_list[i].title,
-              link: gadget.getUrlFor({command: 'display_with_history', options: {
+            promise_list.push(gadget.getUrlFor({command: 'display_with_history', options: {
               jio_key: gadget.state.jio_key,
               view: view_list[i].href,
               page: undefined  // Views in ERP5 must be forms but because of
                                // OfficeJS we keep it empty for different default
-              }})
-            }));
+            }}));
           }
-
           for (i = 0; i < jump_list.length; i += 1) {
-            jump_action_promise_list.push(RSVP.hash({
-              title: jump_list[i].title,
-              i18n: jump_list[i].title,
-              link: gadget.getUrlFor({command: 'push_history', options: {
+            promise_list.push(gadget.getUrlFor({command: 'push_history', options: {
               extended_search: new URI(jump_list[i].href).query(true).query,
               page: 'search'
-              }})
-            }));
+            }}));
           }
-
-          return RSVP.hash({
-            tab_list: RSVP.all(tab_promise_list),
-            jump_action_list: RSVP.all(jump_action_promise_list),
-            breadcrumb_action_list: modifyBreadcrumbList(gadget,
+          promise_list.push(
+            modifyBreadcrumbList(gadget,
                                  erp5_document._links.parent || "#",
-                                    [])
-          });
+                                 breadcrumb_action_list)
+          );
+          return RSVP.all(promise_list);
         })
-        .push(function (result_dict) {
+        .push(function (all_result) {
+          var i, j;
+          j = 0;
+          for (i = 0; i < view_list.length; i += 1) {
+            tab_list.push({
+              title: view_list[i].title,
+              i18n: view_list[i].title,
+              link: all_result[j]
+            });
+            j += 1;
+          }
+          for (i = 0; i < jump_list.length; i += 1) {
+            jump_action_list.push({
+              title: jump_list[i].title,
+              link: all_result[j],
+              i18n: jump_list[i].title
+            });
+            j += 1;
+          }
 
           return gadget.translateHtml(table_template({
-            definition_title: "Views",
-            definition_i18n: "Views",
-            definition_icon: "eye",
-            documentlist: result_dict.tab_list
+            definition_title: tab_title,
+            definition_i18n: tab_title,
+            definition_icon: tab_icon,
+            documentlist: tab_list
           }) + table_template({
             definition_title: "Jumps",
-            documentlist: result_dict.jump_action_list,
+            documentlist: jump_action_list,
             definition_icon: "plane",
             definition_i18n: "Jumps"
           }) + table_template({
             definition_title: "Breadcrumb",
-            documentlist: result_dict.breadcrumb_action_list,
+            documentlist: breadcrumb_action_list,
             definition_icon: "ellipsis-v",
             definition_i18n: "Breadcrumb"
           }));
@@ -145,12 +156,18 @@
         .push(function (my_translated_html) {
           gadget.element.innerHTML = my_translated_html;
 
-          return RSVP.hash({
-            back_url: gadget.getUrlFor({command: 'cancel_dialog_with_history'}),
-            page_title: calculatePageTitle(gadget, erp5_document)
-          });
+          return RSVP.all([
+            gadget.getUrlFor({command: 'cancel_dialog_with_history'}),
+            calculatePageTitle(gadget, erp5_document)
+          ]);
         })
-        .push(gadget.updateHeader.bind(gadget));
+        .push(function (url_list) {
+          var dict = {
+            back_url: url_list[0],
+            page_title: url_list[1]
+          };
+          return gadget.updateHeader(dict);
+        });
     })
     .declareMethod("triggerSubmit", function () {
       return;

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.xml

@@ -148,13 +148,11 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
     </pickle>
     <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_log</string> </key>
-            <value>
+      <tuple>
+        <none/>
         <list>
           <dictionary>
             <item>
@@ -198,20 +196,16 @@
             </item>
           </dictionary>
         </list>
-            </value>
-        </item>
-      </dictionary>
+      </tuple>
     </pickle>
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
     </pickle>
     <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_log</string> </key>
-            <value>
+      <tuple>
+        <none/>
         <list>
           <dictionary>
             <item>
@@ -234,7 +228,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                      <value> <string>980.35570.30592.53077</string> </value>
+                <value> <string>975.28771.29128.25958</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -252,7 +246,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                              <float>1576591900.86</float>
+                        <float>1556782424.57</float>
                         <string>UTC</string>
                       </tuple>
                     </state>
@@ -261,20 +255,16 @@
             </item>
           </dictionary>
         </list>
-            </value>
-        </item>
-      </dictionary>
+      </tuple>
     </pickle>
   </record>
   <record id="5" aka="AAAAAAAAAAU=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
     </pickle>
     <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_log</string> </key>
-            <value>
+      <tuple>
+        <none/>
         <list>
           <dictionary>
             <item>
@@ -322,9 +312,7 @@
             </item>
           </dictionary>
         </list>
-            </value>
-        </item>
-      </dictionary>
+      </tuple>
     </pickle>
   </record>
 </ZopeData>