erp5_web_renderjs_ui: fix cancellation handling

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_relation_input_js.js

@@ -248,8 +248,7 @@
       return RSVP.Queue()
         .push(function () {
           var plane = gadget.element.querySelector("a"),
-            ul = gadget.element.querySelector(".search_ul"),
-            translation_promise;
+            ul = gadget.element.querySelector(".search_ul");
           plane.href = '';
 
           // uid is known
@@ -315,12 +314,9 @@
               return RSVP.delay(200);
             })
             .push(function () {
-              translation_promise = gadget.getTranslationList([
-                'Create New',
-                'Explore the Search Result List'
-              ]);
+              return new RSVP.Queue(RSVP.all([
 
-              return gadget.jio_allDocs({
+                gadget.jio_allDocs({
                   query: Query.objectToSearchText(new ComplexQuery({
                     operator: "AND",
                     query_list: [
@@ -336,12 +332,14 @@
                   limit: [0, 10],
                   select_list: [gadget.state.catalog_index, "uid"],
                   sort_on: JSON.parse(gadget.state.sort_list_json)
-              })
-                .push(function (result) {
-                  return new RSVP.Queue()
-                    .push(function () {
-                      return RSVP.all([result, translation_promise]);
-                    })
+                }),
+
+                gadget.getTranslationList([
+                  'Create New',
+                  'Explore the Search Result List'
+                ])
+
+              ]))
                 .push(function (result_list) {
                   var i,
                     row,
@@ -424,7 +422,6 @@
               throw error;
             });
         });
-        });
 
     })
 

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_relation_input_js.xml

@@ -154,11 +154,13 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -202,16 +204,20 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -234,7 +240,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                <value> <string>978.15497.3144.35652</string> </value>
+                      <value> <string>978.15561.54943.25565</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -252,7 +258,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                        <float>1567695948.47</float>
+                              <float>1583400764.01</float>
                               <string>UTC</string>
                             </tuple>
                           </state>
@@ -261,16 +267,20 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
   <record id="5" aka="AAAAAAAAAAU=">
     <pickle>
-      <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <tuple>
-        <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
               <list>
                 <dictionary>
                   <item>
@@ -320,7 +330,9 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>