[erp5_core] Use listbox_uid parameter to get list of document to delete

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/testDeleteDocumentList.zpt

@@ -61,6 +61,8 @@
 <tr><td>click</td>
     <td>//a[@data-i18n='Delete Multiple Documents']</td><td></td></tr>
 
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded" />
+
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" />
 
 <tr><td>waitForElementNotPresent</td>
@@ -102,55 +104,6 @@
  	  <td>//div[@data-gadget-scope="field_listbox"]//table/tbody/tr[6]/td[4]//a</td>
  	  <td>draft</td></tr>
 
-<tr><td>waitForElementPresent</td>
-    <td>//a[@data-i18n='Actions']</td><td></td></tr>
-<tr><td>click</td>
-    <td>//a[@data-i18n='Actions']</td><td></td></tr>
-
-<tr><td>waitForElementPresent</td>
-    <td>//a[@data-i18n='Delete Multiple Documents']</td><td></td></tr>
-<tr><td>click</td>
-    <td>//a[@data-i18n='Delete Multiple Documents']</td><td></td></tr>
-
-
-
-<tal:block tal:define="pagination_configuration python: {'header': '(6)', 'footer': '6 Records'}">
-  <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_listbox_pagination_text" />
-</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': 'error',
-                                                           'text': 'All documents are selected! Submit again to proceed or Cancel and narrow down your search.'}">
-  <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
-</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" />
-<tr><td>waitForElementNotPresent</td>
-    <td>//input[@name="action_confirm"]</td><td></td></tr>
-
-<tal:block tal:define="notification_configuration python: {'class': 'success',
-                                                           'text': 'Deleted.'}">
-  <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
-</tal:block>
-
-<tal:block tal:define="pagination_configuration python: {'header': '(6)', 'footer': '6 Records'}">
-  <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_listbox_pagination_text" />
-</tal:block>
-
-<tr><td>assertText</td>
- 	  <td>//div[@data-gadget-scope="field_listbox"]//table/tbody/tr[1]/td[4]//a</td>
- 	  <td>deleted</td></tr>
-
-<tr><td>assertText</td>
- 	  <td>//div[@data-gadget-scope="field_listbox"]//table/tbody/tr[4]/td[4]//a</td>
- 	  <td>deleted</td></tr>
-
-<tr><td>assertText</td>
- 	  <td>//div[@data-gadget-scope="field_listbox"]//table/tbody/tr[6]/td[4]//a</td>
- 	  <td>deleted</td></tr>
-
 </tbody></table>
 </body>
 </html>
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_delete.py

@@ -22,11 +22,11 @@ translate = Base_translateString
 REQUEST = kwargs.get("REQUEST", None) or portal.REQUEST
 
 if selection_name:
-  uids = portal.portal_selections.getSelectionCheckedUidsFor(selection_name)
-  if portal.portal_selections.selectionHasChanged(md5_object_uid_list, uids):
+  listbox_uid = portal.portal_selections.getSelectionCheckedUidsFor(selection_name)
+  if portal.portal_selections.selectionHasChanged(md5_object_uid_list, listbox_uid):
     return context.Base_redirect(keep_items={'portal_status_message': translate("Sorry, your selection has changed.")})
 
-if not uids:
+if not listbox_uid:
   return context.Base_redirect(keep_items={
     'portal_status_message': translate("Please select one or more items first."),
     'portal_status_level': "warning"})
@@ -34,8 +34,8 @@ if not uids:
 
 if True:
   # already filters out documents with relations that cannot be deleted
-  object_list = context.Folder_getDeleteObjectList(uid=uids)
-  object_not_deletable_len = len(uids) - len(object_list)
+  object_list = context.Folder_getDeleteObjectList(uid=listbox_uid)
+  object_not_deletable_len = len(listbox_uid) - len(object_list)
 
   # some documents cannot be deleted thus we stop and warn the user
   if object_not_deletable_len == 1:

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_delete.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>form_id=\'\',dialog_id=\'\',selection_index=None,object_uid=None,selection_name=None,field_id=None,cancel_url=\'\',md5_object_uid_list=\'\', uids=(), **kwargs</string> </value>
+            <value> <string>form_id=\'\',dialog_id=\'\',selection_index=None,object_uid=None,selection_name=None,field_id=None,cancel_url=\'\',md5_object_uid_list=\'\', listbox_uid=(), **kwargs</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>