[erp5_hal_json_style] Simplify new content script

Clone Base_doAction to keep the logic identical.

Reuse Folder_create directly to reduce difference from xhtml_style.
Side effect: the status message is modified from 'Document created.' to
'Object created.'

bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_doAction.py

+portal = context.getPortalObject()
+Base_translateString = portal.Base_translateString
+preserved_parameter_dict = {}
+
+Base_doAction = select_action.split()
+if len(Base_doAction) != 0:
+  doAction0 = Base_doAction[0]
+
+kw['keep_items'] = preserved_parameter_dict
+
+if doAction0 == 'add':
+  return context.Folder_create(' '.join(Base_doAction[1:]), **kw)
+# Otherwise, check if this is an automatic menu (template)
+"""
+elif doAction0 == 'template':
+  template_relative_url = ' '.join(Base_doAction[1:])
+  template = context.getPortalObject().restrictedTraverse(template_relative_url)
+  if template is not None:
+    preference = template.getParentValue()
+    preference.manage_copyObjects(ids=[template.getId()], REQUEST=request, RESPONSE=None)
+    new_content_list = context.manage_pasteObjects(request['__cp'])
+    new_content_id = new_content_list[0]['new_id']
+    new_content = context[new_content_id]
+    new_content.makeTemplateInstance()
+    preserved_parameter_dict['portal_status_message'] = Base_translateString("Template created.")
+    redirect_url = new_content.absolute_url()
+  else:
+    preserved_parameter_dict['portal_status_message'] = Base_translateString("Template does not exist.")
+    redirect_url = context.absolute_url()
+else:
+  redirect_url = request['ACTUAL_URL']
+  preserved_parameter_dict['portal_status_message'] = 
+"""
+message = Base_translateString('Error: the action "%s" is not recognised.' % (doAction0, ))
+context.REQUEST.RESPONSE.setStatus(400)
+return context.Base_renderForm(dialog_id, message=message, level='error')

bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_newContentFromJS.xml → bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_doAction.xml

@@ -50,11 +50,11 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>dialog_id, **kw</string> </value>
+            <value> <string>select_action, dialog_id, **kw</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Base_newContentFromJS</string> </value>
+            <value> <string>Base_doAction</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_newContentFromJS.py

-from Products.CMFCore.WorkflowCore import WorkflowException
-from Products.Formulator.Errors import FormValidationError
-from Products.DCWorkflow.DCWorkflow import ValidationFailed
-from Products.ERP5Type.Message import translateString
-from Products.ERP5Type.Log import log
-portal = context.getPortalObject()
-request=context.REQUEST
-
-form = getattr(context, dialog_id)
-
-# Validate the form
-# It is necessary to force editable_mode before validating
-# data. Otherwise, field appears as non editable.
-# This is the pending of form_dialog.
-editable_mode = request.get('editable_mode', 1)
-request.set('editable_mode', 1)
-form.validate_all_to_request(request)
-request.set('editable_mode', editable_mode)
-
-# XXX: this is a duplication from form validation code in Base_callDialogMethod
-# Correct fix is to factorise this script with Base_callDialogMethod, not to
-# fix XXXs here.
-doaction_param_list = {}
-MARKER = []
-for f in form.get_fields():
-  k = f.id
-  v = getattr(request, k, MARKER)
-  if v is not MARKER:
-    if k.startswith('your_'):
-      k=k[5:]
-    elif k.startswith('my_'): # compat
-      k=k[3:]
-    doaction_param_list[k] = v
-
-redirect_document = context.newContent(portal_type=doaction_param_list['portal_type'])
-
-return redirect_document.Base_redirect(keep_items={'portal_status_message': 'Document created.'})

bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_viewNewContentDialog.xml

@@ -35,7 +35,7 @@
         </item>
         <item>
             <key> <string>action</string> </key>
-            <value> <string>Base_newContentFromJS</string> </value>
+            <value> <string>Base_doAction</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -71,7 +71,7 @@
                     <key> <string>left</string> </key>
                     <value>
                       <list>
-                        <string>your_portal_type</string>
+                        <string>your_select_action</string>
                       </list>
                     </value>
                 </item>

bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_viewNewContentDialog/your_portal_type.xml → bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_viewNewContentDialog/your_select_action.xml

@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>your_portal_type</string> </value>
+            <value> <string>your_select_action</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
@@ -269,7 +269,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: [(here.Base_translateString(x), x) for x in context.getVisibleAllowedContentTypeList()]</string> </value>
+            <value> <string>python: [(here.Base_translateString(x), \'add %s\' % x) for x in context.getVisibleAllowedContentTypeList()]</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_check_box_field_zuite/testSimpleCheckBoxField.zpt

@@ -42,7 +42,7 @@
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" />
 
 <tal:block tal:define="notification_configuration python: {'class': 'success',
-                                                           'text': 'Document created.'}">
+                                                           'text': 'Object created.'}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
 </tal:block>
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_date_time_field_zuite/testBasicDateTimeType.zpt

@@ -39,7 +39,7 @@
 </tr>
 
 <tal:block tal:define="notification_configuration python: {'class': 'success',
-                                                           'text': 'Document created.'}">
+                                                           'text': 'Object created.'}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
 </tal:block>
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_date_time_field_zuite/testDateTimeDefaultToNow.zpt

@@ -50,7 +50,7 @@
 
 
 <tal:block tal:define="notification_configuration python: {'class': 'success',
-                                                           'text': 'Document created.'}">
+                                                           'text': 'Object created.'}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
 </tal:block>
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_date_time_field_zuite/testDisplayWithAndWithoutTimeZone.zpt

@@ -43,7 +43,7 @@
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" />
 
 <tal:block tal:define="notification_configuration python: {'class': 'success',
-                                                           'text': 'Document created.'}">
+                                                           'text': 'Object created.'}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
 </tal:block>
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_date_time_field_zuite/testInvalidDateTime.zpt

@@ -43,7 +43,7 @@
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" />
 
 <tal:block tal:define="notification_configuration python: {'class': 'success',
-                                                           'text': 'Document created.'}">
+                                                           'text': 'Object created.'}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
 </tal:block>
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_date_time_field_zuite/testLeapYear.zpt

@@ -43,7 +43,7 @@
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" />
 
 <tal:block tal:define="notification_configuration python: {'class': 'success',
-                                                           'text': 'Document created.'}">
+                                                           'text': 'Object created.'}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
 </tal:block>
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_date_time_field_zuite/testRestoreDateTimeValueIfValidationError.zpt

@@ -98,7 +98,7 @@
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" />
 
 <tal:block tal:define="notification_configuration python: {'class': 'success',
-                                                           'text': 'Document created.'}">
+                                                           'text': 'Object created.'}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
 </tal:block>
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_date_time_field_zuite/testSetDateTimeZone.zpt

@@ -43,7 +43,7 @@
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" />
 
 <tal:block tal:define="notification_configuration python: {'class': 'success',
-                                                           'text': 'Document created.'}">
+                                                           'text': 'Object created.'}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
 </tal:block>
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_date_time_field_zuite/testSetDateTimeZone2DigitsYear.zpt

@@ -43,7 +43,7 @@
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" />
 
 <tal:block tal:define="notification_configuration python: {'class': 'success',
-                                                           'text': 'Document created.'}">
+                                                           'text': 'Object created.'}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
 </tal:block>
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_date_time_field_zuite/testSetTimeZoneWithoutDateTime.zpt

@@ -43,7 +43,7 @@
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" />
 
 <tal:block tal:define="notification_configuration python: {'class': 'success',
-                                                           'text': 'Document created.'}">
+                                                           'text': 'Object created.'}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
 </tal:block>
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_list_field_zuite/testDisabledOptionListField.zpt

@@ -47,7 +47,7 @@
 </tr>
 
 <tal:block tal:define="notification_configuration python: {'class': 'success',
-                                                           'text': 'Document created.'}">
+                                                           'text': 'Object created.'}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
 </tal:block>
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_list_field_zuite/testEmptyListField.zpt

@@ -51,7 +51,7 @@
 </tr>
 
 <tal:block tal:define="notification_configuration python: {'class': 'success',
-                                                           'text': 'Document created.'}">
+                                                           'text': 'Object created.'}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
 </tal:block>
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_list_field_zuite/testListField.zpt

@@ -51,7 +51,7 @@
 </tr>
 
 <tal:block tal:define="notification_configuration python: {'class': 'success',
-                                                           'text': 'Document created.'}">
+                                                           'text': 'Object created.'}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
 </tal:block>
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testDoNotCreateUnneededAnchorTag.zpt

@@ -50,7 +50,7 @@
 
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" />
 <tal:block tal:define="notification_configuration python: {'class': 'success',
-                                                           'text': 'Document created.'}">
+                                                           'text': 'Object created.'}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
 </tal:block>
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testEditNotIndexedDocument.zpt

@@ -45,7 +45,7 @@
 
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" />
 <tal:block tal:define="notification_configuration python: {'class': 'success',
-                                                           'text': 'Document created.'}">
+                                                           'text': 'Object created.'}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
 </tal:block>
 
@@ -69,7 +69,7 @@
 
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" />
 <tal:block tal:define="notification_configuration python: {'class': 'success',
-                                                           'text': 'Document created.'}">
+                                                           'text': 'Object created.'}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
 </tal:block>