[erp5_web_renderjs_ui] Do not redirect after a download

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.js

@@ -494,11 +494,10 @@ and handling data send&receive.
             .push(function () {
               return gadget.forceDownload(attachment);
             })
-            // we could redirect back after download which was not possible
-            // in the old UI but it will be a change of behaviour
-            // Nicolas required this feature to be allowed
+            // do not redirect after the download
+            // it allows user to modify report parameter and regenerate it
+            // otherwise, the back button from the browser does not fill the form
             .push(function () {
-              result.jio_key = jio_key;
               return result;
             });
         })

bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.xml

@@ -148,11 +148,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>
@@ -196,16 +198,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>
@@ -228,7 +234,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                <value> <string>979.200.9391.33553</string> </value>
+                      <value> <string>980.19453.2043.40055</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -246,7 +252,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                        <float>1570693140.76</float>
+                              <float>1575625017.2</float>
                               <string>UTC</string>
                             </tuple>
                           </state>
@@ -255,16 +261,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>
@@ -312,7 +322,9 @@
                   </item>
                 </dictionary>
               </list>
-      </tuple>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_dms_zuite/testExchangeActionConvertImage.zpt

@@ -36,21 +36,21 @@
 </tr>
 
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" />
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
 
 <tal:block tal:define="notification_configuration python: {'class': 'success',
                                                            'text': 'Data received.'}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
 </tal:block>
-<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
 
 <tr>
   <td>assertElementPresent</td>
-  <td>//div[contains(@data-gadget-url, 'gadget_erp5_pt_form_view.html')]</td>
+  <td>//div[contains(@data-gadget-url, 'gadget_erp5_pt_form_dialog.html')]</td>
   <td></td>
 </tr>
 <tr>
   <td>assertTextPresent</td>
-  <td>gadget_erp5_worklist_empty.svg</td>
+  <td>Download Converted File</td>
   <td></td>
 </tr>
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_dms_zuite/testExchangeActionDownloadOriginal.zpt

@@ -29,21 +29,21 @@
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/go_to_selected_exchange_dialog" />
 </tal:block>
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" />
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
 
 <tal:block tal:define="notification_configuration python: {'class': 'success',
                                                            'text': 'Data received.'}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
 </tal:block>
-<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
 
 <tr>
   <td>assertElementPresent</td>
-  <td>//div[contains(@data-gadget-url, 'gadget_erp5_pt_form_view.html')]</td>
+  <td>//div[contains(@data-gadget-url, 'gadget_erp5_pt_form_dialog.html')]</td>
   <td></td>
 </tr>
 <tr>
   <td>assertTextPresent</td>
-  <td>gadget_erp5_worklist_empty.svg</td>
+  <td>Download Original File</td>
   <td></td>
 </tr>