From 4d75b17f9aeace0100c5b09699a8a2f67af5a5ed Mon Sep 17 00:00:00 2001 From: "lu.xu" Date: Wed, 3 Jul 2019 10:04:28 +0000 Subject: [PATCH 01/10] erp5_smart_assistant: added a simple workflow with interaction --- .../workflow_chain_type.xml | 2 +- .../smart_assistant_interaction_workflow.xml | 46 ++++++++ .../interactions.xml | 28 +++++ .../interactions/text_content.xml | 100 ++++++++++++++++++ .../scripts.xml | 28 +++++ .../SmartAssistant_addReplyToTextContent.py | 3 + .../SmartAssistant_addReplyToTextContent.xml | 62 +++++++++++ .../variables.xml | 22 ++++ .../worklists.xml | 22 ++++ .../smart_assistant_workflow.xml | 66 ++++++++++++ .../smart_assistant_workflow/scripts.xml | 22 ++++ .../smart_assistant_workflow/states.xml | 28 +++++ .../smart_assistant_workflow/states/draft.xml | 39 +++++++ .../states/responded.xml | 41 +++++++ .../states/submitted.xml | 39 +++++++ .../states/validated.xml | 36 +++++++ .../smart_assistant_workflow/transitions.xml | 28 +++++ .../transitions/respond.xml | 79 ++++++++++++++ .../transitions/respond_action.xml | 79 ++++++++++++++ .../transitions/submit.xml | 79 ++++++++++++++ .../transitions/submit_action.xml | 79 ++++++++++++++ .../transitions/validate.xml | 79 ++++++++++++++ .../transitions/validate_action.xml | 79 ++++++++++++++ .../smart_assistant_workflow/variables.xml | 28 +++++ .../variables/action.xml | 61 +++++++++++ .../variables/actor.xml | 61 +++++++++++ .../variables/comment.xml | 61 +++++++++++ .../variables/error_message.xml | 48 +++++++++ .../variables/history.xml | 61 +++++++++++ .../variables/portal_type.xml | 48 +++++++++ .../variables/time.xml | 61 +++++++++++ .../smart_assistant_workflow/worklists.xml | 28 +++++ .../0B_submitt_smart_assistant_list.xml | 84 +++++++++++++++ .../template_portal_type_workflow_chain_list | 4 +- .../bt/template_workflow_id_list | 2 + 35 files changed, 1631 insertions(+), 2 deletions(-) create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/interactions.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/interactions/text_content.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/scripts.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/scripts/SmartAssistant_addReplyToTextContent.py create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/scripts/SmartAssistant_addReplyToTextContent.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/variables.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/worklists.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/scripts.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states/draft.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states/responded.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states/submitted.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states/validated.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/respond.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/respond_action.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/submit.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/submit_action.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/validate.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/validate_action.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/action.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/actor.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/comment.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/error_message.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/history.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/portal_type.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/time.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/worklists.xml create mode 100644 bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/worklists/0B_submitt_smart_assistant_list.xml create mode 100644 bt5/erp5_smart_assistant/bt/template_workflow_id_list diff --git a/bt5/erp5_smart_assistant/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_smart_assistant/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index cc359b09421..3fc08ff2efa 100644 --- a/bt5/erp5_smart_assistant/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/bt5/erp5_smart_assistant/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -13,6 +13,6 @@ Smart Assistant Text - edit_workflow + edit_workflow, smart_assistant_interaction_workflow, smart_assistant_workflow \ No newline at end of file diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow.xml new file mode 100644 index 00000000000..e264bb4080a --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow.xml @@ -0,0 +1,46 @@ + + + + + + + + + + _objects + + + + + + creation_guard + + + + + + description + + + + groups + + + + + + id + smart_assistant_interaction_workflow + + + manager_bypass + 0 + + + title + Smart Assistant Interaction Workflow + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/interactions.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/interactions.xml new file mode 100644 index 00000000000..e18bf8cbf77 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/interactions.xml @@ -0,0 +1,28 @@ + + + + + + + + + + _mapping + + + + + + _objects + + + + + + id + interactions + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/interactions/text_content.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/interactions/text_content.xml new file mode 100644 index 00000000000..4eaa2fcc0b7 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/interactions/text_content.xml @@ -0,0 +1,100 @@ + + + + + + + + + + actbox_category + workflow + + + actbox_name + + + + actbox_url + + + + activate_script_name + + + + + + after_script_name + + + + + + before_commit_script_name + + + SmartAssistant_addReplyToTextContent + + + + + description + + + + guard + + + + + + id + text_content + + + method_id + + + _setTextContent.* + + + + + once_per_transaction + 0 + + + portal_type_filter + + + + + + portal_type_group_filter + + + + + + script_name + + + + + + temporary_document_disallowed + 1 + + + title + + + + trigger_type + 2 + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/scripts.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/scripts.xml new file mode 100644 index 00000000000..072c8f6540c --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/scripts.xml @@ -0,0 +1,28 @@ + + + + + + + + + + _mapping + + + + + + _objects + + + + + + id + scripts + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/scripts/SmartAssistant_addReplyToTextContent.py b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/scripts/SmartAssistant_addReplyToTextContent.py new file mode 100644 index 00000000000..993d0aea60a --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/scripts/SmartAssistant_addReplyToTextContent.py @@ -0,0 +1,3 @@ +document = state_change['object'] +if document.getValidationState() in ("draft","responded"): + document.submit() diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/scripts/SmartAssistant_addReplyToTextContent.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/scripts/SmartAssistant_addReplyToTextContent.xml new file mode 100644 index 00000000000..5d7ec19acd3 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/scripts/SmartAssistant_addReplyToTextContent.xml @@ -0,0 +1,62 @@ + + + + + + + + + + Script_magic + 3 + + + _bind_names + + + + + + + + + + _asgns + + + + name_container + container + + + name_context + context + + + name_m_self + script + + + name_subpath + traverse_subpath + + + + + + + + + + + _params + state_change + + + id + SmartAssistant_addReplyToTextContent + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/variables.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/variables.xml new file mode 100644 index 00000000000..6ae03699d19 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/variables.xml @@ -0,0 +1,22 @@ + + + + + + + + + + _mapping + + + + + + id + variables + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/worklists.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/worklists.xml new file mode 100644 index 00000000000..c3432aa051e --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/worklists.xml @@ -0,0 +1,22 @@ + + + + + + + + + + _mapping + + + + + + id + worklists + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow.xml new file mode 100644 index 00000000000..d88493957af --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow.xml @@ -0,0 +1,66 @@ + + + + + + + + + + _objects + + + + + + creation_guard + + + + + + description + + + + groups + + + + + + id + smart_assistant_workflow + + + initial_state + draft + + + manager_bypass + 0 + + + permissions + + + Access contents information + View + Add portal content + Modify portal content + Delete objects + + + + + state_var + validation_state + + + title + Smart Assistant Workflow + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/scripts.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/scripts.xml new file mode 100644 index 00000000000..a703b14c4ca --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/scripts.xml @@ -0,0 +1,22 @@ + + + + + + + + + + _mapping + + + + + + id + scripts + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states.xml new file mode 100644 index 00000000000..27ec9069024 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states.xml @@ -0,0 +1,28 @@ + + + + + + + + + + _mapping + + + + + + _objects + + + + + + id + states + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states/draft.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states/draft.xml new file mode 100644 index 00000000000..f50e19b5b74 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states/draft.xml @@ -0,0 +1,39 @@ + + + + + + + + + + description + + + + id + draft + + + title + Draft + + + transitions + + + submit + submit_action + + + + + type_list + + + + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states/responded.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states/responded.xml new file mode 100644 index 00000000000..bb47de21ca0 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states/responded.xml @@ -0,0 +1,41 @@ + + + + + + + + + + description + + + + id + responded + + + title + Responded + + + transitions + + + submit + submit_action + validate + validate_action + + + + + type_list + + + + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states/submitted.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states/submitted.xml new file mode 100644 index 00000000000..dce2c3a5812 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states/submitted.xml @@ -0,0 +1,39 @@ + + + + + + + + + + description + + + + id + submitted + + + title + Submitted + + + transitions + + + respond + respond_action + + + + + type_list + + + + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states/validated.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states/validated.xml new file mode 100644 index 00000000000..78f1a8e8b62 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/states/validated.xml @@ -0,0 +1,36 @@ + + + + + + + + + + description + + + + id + validated + + + title + Validated + + + transitions + + + + + + type_list + + + + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions.xml new file mode 100644 index 00000000000..aa36144efed --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions.xml @@ -0,0 +1,28 @@ + + + + + + + + + + _mapping + + + + + + _objects + + + + + + id + transitions + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/respond.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/respond.xml new file mode 100644 index 00000000000..e56b84c27b4 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/respond.xml @@ -0,0 +1,79 @@ + + + + + + + + + + actbox_category + workflow + + + actbox_icon + + + + actbox_name + + + + actbox_url + + + + after_script_name + + + + description + + + + guard + + AAAAAAAAAAI= + + + + id + respond + + + new_state_id + responded + + + script_name + + + + title + Respond + + + trigger_type + 2 + + + + + + + + + + + + permissions + + + Modify portal content + + + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/respond_action.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/respond_action.xml new file mode 100644 index 00000000000..c4551b55b39 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/respond_action.xml @@ -0,0 +1,79 @@ + + + + + + + + + + actbox_category + workflow + + + actbox_icon + + + + actbox_name + Respond + + + actbox_url + %(content_url)s/Base_viewWorkflowActionDialog?workflow_action=respond_action + + + after_script_name + respond + + + description + + + + guard + + AAAAAAAAAAI= + + + + id + respond_action + + + new_state_id + + + + script_name + + + + title + Respond Action + + + trigger_type + 1 + + + + + + + + + + + + permissions + + + Modify portal content + + + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/submit.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/submit.xml new file mode 100644 index 00000000000..86144e43758 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/submit.xml @@ -0,0 +1,79 @@ + + + + + + + + + + actbox_category + workflow + + + actbox_icon + + + + actbox_name + + + + actbox_url + + + + after_script_name + + + + description + + + + guard + + AAAAAAAAAAI= + + + + id + submit + + + new_state_id + submitted + + + script_name + + + + title + Submit + + + trigger_type + 2 + + + + + + + + + + + + permissions + + + Modify portal content + + + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/submit_action.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/submit_action.xml new file mode 100644 index 00000000000..0c2bd2d35c2 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/submit_action.xml @@ -0,0 +1,79 @@ + + + + + + + + + + actbox_category + workflow + + + actbox_icon + + + + actbox_name + Submit + + + actbox_url + %(content_url)s/Base_viewWorkflowActionDialog?workflow_action=submit_action + + + after_script_name + submit + + + description + + + + guard + + AAAAAAAAAAI= + + + + id + submit_action + + + new_state_id + + + + script_name + + + + title + Submit Action + + + trigger_type + 1 + + + + + + + + + + + + permissions + + + Modify portal content + + + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/validate.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/validate.xml new file mode 100644 index 00000000000..2631a02e2f6 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/validate.xml @@ -0,0 +1,79 @@ + + + + + + + + + + actbox_category + workflow + + + actbox_icon + + + + actbox_name + + + + actbox_url + + + + after_script_name + + + + description + + + + guard + + AAAAAAAAAAI= + + + + id + validate + + + new_state_id + validated + + + script_name + + + + title + Validate + + + trigger_type + 2 + + + + + + + + + + + + permissions + + + Modify portal content + + + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/validate_action.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/validate_action.xml new file mode 100644 index 00000000000..8553398f2fe --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/transitions/validate_action.xml @@ -0,0 +1,79 @@ + + + + + + + + + + actbox_category + workflow + + + actbox_icon + + + + actbox_name + Validate + + + actbox_url + %(content_url)s/Base_viewWorkflowActionDialog?workflow_action=validate_action + + + after_script_name + validate + + + description + + + + guard + + AAAAAAAAAAI= + + + + id + validate_action + + + new_state_id + + + + script_name + + + + title + Validate Action + + + trigger_type + 1 + + + + + + + + + + + + permissions + + + Modify portal content + + + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables.xml new file mode 100644 index 00000000000..bb12bef805f --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables.xml @@ -0,0 +1,28 @@ + + + + + + + + + + _mapping + + + + + + _objects + + + + + + id + variables + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/action.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/action.xml new file mode 100644 index 00000000000..bb5af22d393 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/action.xml @@ -0,0 +1,61 @@ + + + + + + + + + + default_expr + + AAAAAAAAAAI= + + + + default_value + + + + description + Transition id + + + for_catalog + 0 + + + for_status + 1 + + + id + action + + + info_guard + + + + + + update_always + 1 + + + + + + + + + + + + text + transition/getId|nothing + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/actor.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/actor.xml new file mode 100644 index 00000000000..fd10331a7a0 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/actor.xml @@ -0,0 +1,61 @@ + + + + + + + + + + default_expr + + AAAAAAAAAAI= + + + + default_value + + + + description + Name of the user who performed transition + + + for_catalog + 0 + + + for_status + 1 + + + id + actor + + + info_guard + + + + + + update_always + 1 + + + + + + + + + + + + text + user/getIdOrUserName + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/comment.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/comment.xml new file mode 100644 index 00000000000..fda919ee861 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/comment.xml @@ -0,0 +1,61 @@ + + + + + + + + + + default_expr + + AAAAAAAAAAI= + + + + default_value + + + + description + Comment about transition + + + for_catalog + 0 + + + for_status + 1 + + + id + comment + + + info_guard + + + + + + update_always + 1 + + + + + + + + + + + + text + python:state_change.kwargs.get(\'comment\', \'\') + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/error_message.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/error_message.xml new file mode 100644 index 00000000000..535863de2a2 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/error_message.xml @@ -0,0 +1,48 @@ + + + + + + + + + + default_expr + + + + + + default_value + + + + description + Error message if validation failed + + + for_catalog + 0 + + + for_status + 1 + + + id + error_message + + + info_guard + + + + + + update_always + 1 + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/history.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/history.xml new file mode 100644 index 00000000000..44306b76d74 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/history.xml @@ -0,0 +1,61 @@ + + + + + + + + + + default_expr + + AAAAAAAAAAI= + + + + default_value + + + + description + Provides access to workflow history + + + for_catalog + 0 + + + for_status + 0 + + + id + history + + + info_guard + + + + + + update_always + 0 + + + + + + + + + + + + text + state_change/getHistory + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/portal_type.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/portal_type.xml new file mode 100644 index 00000000000..89576a7a56a --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/portal_type.xml @@ -0,0 +1,48 @@ + + + + + + + + + + default_expr + + + + + + default_value + + + + description + Portal type (used as filter for worklists) + + + for_catalog + 1 + + + for_status + 0 + + + id + portal_type + + + info_guard + + + + + + update_always + 0 + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/time.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/time.xml new file mode 100644 index 00000000000..0d2d8d7e221 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/variables/time.xml @@ -0,0 +1,61 @@ + + + + + + + + + + default_expr + + AAAAAAAAAAI= + + + + default_value + + + + description + Transition timestamp + + + for_catalog + 0 + + + for_status + 1 + + + id + time + + + info_guard + + + + + + update_always + 1 + + + + + + + + + + + + text + state_change/getDateTime + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/worklists.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/worklists.xml new file mode 100644 index 00000000000..c7242ee1148 --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/worklists.xml @@ -0,0 +1,28 @@ + + + + + + + + + + _mapping + + + + + + _objects + + + + + + id + worklists + + + + + diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/worklists/0B_submitt_smart_assistant_list.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/worklists/0B_submitt_smart_assistant_list.xml new file mode 100644 index 00000000000..e2a6706032d --- /dev/null +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_workflow/worklists/0B_submitt_smart_assistant_list.xml @@ -0,0 +1,84 @@ + + + + + + + + + + actbox_category + global + + + actbox_icon + + + + actbox_name + Smart Assistant Text to Respond (%(count)s) + + + actbox_url + + + + description + Submit SA Text + + + guard + + + + + + id + 0B_submitt_smart_assistant_list + + + var_matches + + AAAAAAAAAAI= + + + + + + + + + + + + + data + + + + portal_type + + + Smart Assistant Text + + + + + validation_state + + + submitted + + + + + + + + + + diff --git a/bt5/erp5_smart_assistant/bt/template_portal_type_workflow_chain_list b/bt5/erp5_smart_assistant/bt/template_portal_type_workflow_chain_list index e1073bd3dcb..5f0b9ed610b 100644 --- a/bt5/erp5_smart_assistant/bt/template_portal_type_workflow_chain_list +++ b/bt5/erp5_smart_assistant/bt/template_portal_type_workflow_chain_list @@ -1,4 +1,6 @@ Smart Assistant File | edit_workflow Smart Assistant Image | edit_workflow Smart Assistant Sound | edit_workflow -Smart Assistant Text | edit_workflow \ No newline at end of file +Smart Assistant Text | edit_workflow +Smart Assistant Text | smart_assistant_interaction_workflow +Smart Assistant Text | smart_assistant_workflow \ No newline at end of file diff --git a/bt5/erp5_smart_assistant/bt/template_workflow_id_list b/bt5/erp5_smart_assistant/bt/template_workflow_id_list new file mode 100644 index 00000000000..be96e0c5629 --- /dev/null +++ b/bt5/erp5_smart_assistant/bt/template_workflow_id_list @@ -0,0 +1,2 @@ +smart_assistant_interaction_workflow +smart_assistant_workflow \ No newline at end of file -- 2.30.9 From 5d2dbd45c290a1e55c17b8d014fb28d83818ac39 Mon Sep 17 00:00:00 2001 From: "lu.xu" Date: Wed, 3 Jul 2019 12:37:18 +0000 Subject: [PATCH 02/10] erp5_smart_assistant: implement view and JIO view --- .../Smart%20Assistant%20File/jio_view.xml | 2 +- .../Smart%20Assistant%20Image/jio_view.xml | 2 +- .../Smart%20Assistant%20Sound/jio_view.xml | 4 +- .../Smart%20Assistant%20Text/jio_view.xml | 2 +- .../Smart%20Assistant%20Image.xml | 2 +- .../Smart%20Assistant%20Sound%20Module.xml | 31 +- .../Smart%20Assistant%20Sound.xml | 2 +- ...tFileModule_viewSmartAssistantFileList.xml | 9 +- .../listbox.xml | 439 +++++++++++++++++- .../listbox_creation_date.xml | 90 ++++ .../SmartAssistantFile_view.xml | 1 + .../my_text_content.xml | 280 +++++++++++ .../SmartAssistantImage_view.xml | 1 + .../SmartAssistantImage_view/image.xml | 335 +++++++++++++ .../listbox.xml | 24 +- .../SmartAssistantSound_view.xml | 4 + .../my_text_content.xml | 280 +++++++++++ .../my_translated_validation_state_title.xml | 90 ++++ .../your_modification_date.xml | 287 ++++++++++++ .../SmartAssistantSound_view/your_player.xml | 291 ++++++++++++ .../SmartAssistantSound_viewAsJIO.xml | 134 ++++++ .../my_text_content.xml | 280 +++++++++++ .../my_title.xml | 272 +++++++++++ .../your_modification_date.xml | 287 ++++++++++++ .../your_player.xml | 291 ++++++++++++ .../your_validation_state.xml | 287 ++++++++++++ .../listbox.xml | 17 +- .../SmartAssistantText_view.xml | 2 + .../my_translated_validation_state_title.xml | 90 ++++ .../your_modification_date.xml | 287 ++++++++++++ .../SmartAssistantText_viewAsJIO.xml | 1 + .../your_validation_state.xml | 287 ++++++++++++ 32 files changed, 4388 insertions(+), 23 deletions(-) create mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList/listbox_creation_date.xml create mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFile_view/my_text_content.xml create mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_image/SmartAssistantImage_view/image.xml create mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view/my_text_content.xml create mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view/my_translated_validation_state_title.xml create mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view/your_modification_date.xml create mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view/your_player.xml create mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO.xml create mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/my_text_content.xml create mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/my_title.xml create mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_modification_date.xml create mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_player.xml create mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_validation_state.xml create mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_view/my_translated_validation_state_title.xml create mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_view/your_modification_date.xml create mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/your_validation_state.xml diff --git a/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20File/jio_view.xml b/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20File/jio_view.xml index f8f3926e07f..3d40b8513bf 100644 --- a/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20File/jio_view.xml +++ b/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20File/jio_view.xml @@ -56,7 +56,7 @@ priority - 1.0 + 2.0 title diff --git a/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Image/jio_view.xml b/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Image/jio_view.xml index f8f3926e07f..3d40b8513bf 100644 --- a/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Image/jio_view.xml +++ b/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Image/jio_view.xml @@ -56,7 +56,7 @@ priority - 1.0 + 2.0 title diff --git a/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Sound/jio_view.xml b/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Sound/jio_view.xml index f8f3926e07f..f2174bca28a 100644 --- a/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Sound/jio_view.xml +++ b/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Sound/jio_view.xml @@ -56,7 +56,7 @@ priority - 1.0 + 2.0 title @@ -77,7 +77,7 @@ text - string:${object_url}/File_viewAsJIO + string:${object_url}/SmartAssistantSound_viewAsJIO diff --git a/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Text/jio_view.xml b/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Text/jio_view.xml index cb6d73ad880..78b5f9f4963 100644 --- a/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Text/jio_view.xml +++ b/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Text/jio_view.xml @@ -56,7 +56,7 @@ priority - 1.0 + 3.0 title diff --git a/bt5/erp5_smart_assistant/PortalTypeTemplateItem/portal_types/Smart%20Assistant%20Image.xml b/bt5/erp5_smart_assistant/PortalTypeTemplateItem/portal_types/Smart%20Assistant%20Image.xml index c54796ba606..f3406ff548f 100644 --- a/bt5/erp5_smart_assistant/PortalTypeTemplateItem/portal_types/Smart%20Assistant%20Image.xml +++ b/bt5/erp5_smart_assistant/PortalTypeTemplateItem/portal_types/Smart%20Assistant%20Image.xml @@ -44,7 +44,7 @@ type_class - File + Image type_interface diff --git a/bt5/erp5_smart_assistant/PortalTypeTemplateItem/portal_types/Smart%20Assistant%20Sound%20Module.xml b/bt5/erp5_smart_assistant/PortalTypeTemplateItem/portal_types/Smart%20Assistant%20Sound%20Module.xml index 8cdc58a2251..a1bcc3791fc 100644 --- a/bt5/erp5_smart_assistant/PortalTypeTemplateItem/portal_types/Smart%20Assistant%20Sound%20Module.xml +++ b/bt5/erp5_smart_assistant/PortalTypeTemplateItem/portal_types/Smart%20Assistant%20Sound%20Module.xml @@ -54,17 +54,23 @@ - short_title + description AAAAAAAAAAM= - title + short_title AAAAAAAAAAQ= + + title + + AAAAAAAAAAU= + + @@ -72,6 +78,25 @@ + + + + + + + domain_name + + + + + + property_name + description + + + + + @@ -88,7 +113,7 @@ - + diff --git a/bt5/erp5_smart_assistant/PortalTypeTemplateItem/portal_types/Smart%20Assistant%20Sound.xml b/bt5/erp5_smart_assistant/PortalTypeTemplateItem/portal_types/Smart%20Assistant%20Sound.xml index c584da0ec30..0452689b959 100644 --- a/bt5/erp5_smart_assistant/PortalTypeTemplateItem/portal_types/Smart%20Assistant%20Sound.xml +++ b/bt5/erp5_smart_assistant/PortalTypeTemplateItem/portal_types/Smart%20Assistant%20Sound.xml @@ -44,7 +44,7 @@ type_class - File + Sound type_interface diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList.xml index 2d6a5b64d52..fa292a6d704 100644 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList.xml +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList.xml @@ -53,15 +53,16 @@ bottom - - listbox - + center - + + listbox + listbox_creation_date + diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList/listbox.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList/listbox.xml index 06a63cecbff..41f0b34a8f5 100644 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList/listbox.xml +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList/listbox.xml @@ -10,9 +10,16 @@ delegated_list - portal_type + all_columns + columns + domain_root_list + domain_tree + editable_columns + search_columns selection_name + sort_columns title + url_columns @@ -43,6 +50,10 @@ form_id + + target + + @@ -58,6 +69,14 @@ form_id + + selection_name + + + + target + + @@ -65,33 +84,439 @@ values + + all_columns + + + + id + ID + + + title + Title + + + translated_portal_type + Type + + + reference + Reference + + + version + Version + + + language + Language + + + revision + Revision + + + short_title + Short Title + + + description + Description + + + int_index + Index + + + translated_validation_state_title + State + + + source_reference + Original Filename + + + classification_logical_path + Classification Path + + + classification_title + Classification + + + group_title + Group + + + site_title + Site + + + function_title + Function + + + follow_up_title + Follow-up + + + publication_section_title + Publication Section + + + contributor_title + Contributors + + + thumbnail + Thumbnail + + + subject_title + Keywords + + + creation_date + Creation Date + + + modification_date + Modification Date + + + download + Download + + + + + + columns + + + + title + Title + + + translated_portal_type + Type + + + reference + Reference + + + version + Version + + + language + Language + + + revision + Revision + + + short_title + Short Title + + + description + Description + + + int_index + Index + + + modification_date + Modification Date + + + translated_validation_state_title + State + + + + + + domain_root_list + + + + publication_section + Publication Section + + + region + Region + + + function + Function + + + site + Site + + + + + + domain_tree + 1 + + + editable_columns + + + + creation_date + Creation Date + + + modification_date + Modification Date + + + + field_id - my_list_mode_listbox + my_view_mode_module_listbox form_id - Base_viewFieldLibrary + Base_viewDMSFieldLibrary - portal_type + search_columns - Smart Assistant File - Smart Assistant File + id + ID + + + title + Title + + + translated_portal_type + Type + + + reference + Reference + + + version + Version + + + language + Language + + + revision + Revision + + + short_title + Short Title + + + description + Description + + + int_index + Index + + + translated_validation_state_title + State + + + source_reference + Original Filename + + + classification_logical_path + Classification Path + + + classification_title + Classification + + + group_title + Group + + + site_title + Site + + + function_title + Function + + + follow_up_title + Follow Up + + + publication_section_title + Publication Section + + + contributor_title + Contributors + + + subject_title + Keywords + + + creation_date + Creation Date + + + modification_date + Modification Date selection_name - smart_assistant_file_module_selection + document_selection + + + sort_columns + + + + id + ID + + + title + Title + + + translated_portal_type + Type + + + reference + Reference + + + version + Version + + + language + Language + + + revision + Revision + + + short_title + Short Title + + + description + Description + + + int_index + Index + + + translated_validation_state_title + State + + + source_reference + Original Filename + + + classification_logical_path + Classification Path + + + classification_title + Classification + + + group_title + Group + + + site_title + Site + + + function_title + Function + + + follow_up_title + Follow Up + + + publication_section_title + Publication Section + + + contributor_title + Contributors + + + thumbnail + Thumbnail + + + subject_title + Keywords + + + creation_date + Creation Date + + + modification_date + Modification Date + + + + + + target + Click to edit the target title Smart Assistant Files + + url_columns + + + + download + File_getDownloadUrl + + + + diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList/listbox_creation_date.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList/listbox_creation_date.xml new file mode 100644 index 00000000000..06545e5412d --- /dev/null +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList/listbox_creation_date.xml @@ -0,0 +1,90 @@ + + + + + + + + + + delegated_list + + + + + + id + listbox_creation_date + + + message_values + + + + external_validator_failed + The input failed the external validator. + + + + + + overrides + + + + field_id + + + + form_id + + + + target + + + + + + + tales + + + + field_id + + + + form_id + + + + target + + + + + + + values + + + + field_id + my_view_mode_listbox_read_only_creation_date + + + form_id + Base_viewDMSFieldLibrary + + + target + Click to edit the target + + + + + + + + diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFile_view.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFile_view.xml index d61cf09efaf..c879e291208 100644 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFile_view.xml +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFile_view.xml @@ -73,6 +73,7 @@ my_title + my_text_content diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFile_view/my_text_content.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFile_view/my_text_content.xml new file mode 100644 index 00000000000..0d9909c1b2c --- /dev/null +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFile_view/my_text_content.xml @@ -0,0 +1,280 @@ + + + + + + + + + + id + my_text_content + + + message_values + + + + external_validator_failed + The input failed the external validator. + + + line_too_long + A line was too long. + + + required_not_found + Input is required but no input given. + + + too_long + You entered too many characters. + + + too_many_lines + You entered too many lines. + + + + + + overrides + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + height + + + + hidden + + + + max_length + + + + max_linelength + + + + max_lines + + + + required + + + + title + + + + unicode + + + + whitespace_preserve + + + + width + + + + + + + tales + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + height + + + + hidden + + + + max_length + + + + max_linelength + + + + max_lines + + + + required + + + + title + + + + unicode + + + + whitespace_preserve + + + + width + + + + + + + values + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + editable + 1 + + + enabled + 1 + + + external_validator + + + + extra + + + + height + 5 + + + hidden + 0 + + + max_length + + + + max_linelength + + + + max_lines + + + + required + 0 + + + title + Text Content + + + unicode + 0 + + + whitespace_preserve + 0 + + + width + 40 + + + + + + + + diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_image/SmartAssistantImage_view.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_image/SmartAssistantImage_view.xml index d282482391e..03fcc76f8de 100644 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_image/SmartAssistantImage_view.xml +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_image/SmartAssistantImage_view.xml @@ -73,6 +73,7 @@ my_title + image diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_image/SmartAssistantImage_view/image.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_image/SmartAssistantImage_view/image.xml new file mode 100644 index 00000000000..38480f4ff8e --- /dev/null +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_image/SmartAssistantImage_view/image.xml @@ -0,0 +1,335 @@ + + + + + + + + + + id + image + + + message_values + + + + external_validator_failed + The input failed the external validator. + + + required_not_found + Input is required but no input given. + + + too_long + Too much input was given. + + + + + + overrides + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + display_maxwidth + + + + display_width + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + hidden + + + + image_display + + + + image_format + + + + image_pre_converted_only + + + + image_quality + + + + input_type + + + + max_length + + + + required + + + + title + + + + truncate + + + + unicode + + + + whitespace_preserve + + + + + + + tales + + + + alternate_name + + + + css_class + + + + default + + AAAAAAAAAAI= + + + + description + + + + display_maxwidth + + + + display_width + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + hidden + + + + image_display + + + + image_format + + + + image_pre_converted_only + + + + image_quality + + + + input_type + + + + max_length + + + + required + + + + title + + + + truncate + + + + unicode + + + + whitespace_preserve + + + + + + + values + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + display_maxwidth + + + + display_width + 20 + + + editable + 1 + + + enabled + 1 + + + external_validator + + + + extra + + + + hidden + 0 + + + image_display + thumbnail + + + image_format + + + + image_pre_converted_only + 0 + + + image_quality + 75 + + + input_type + text + + + max_length + + + + required + 0 + + + title + Image + + + truncate + 0 + + + unicode + 0 + + + whitespace_preserve + 0 + + + + + + + + + + + + + + + _text + here/absolute_url + + + + + diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSoundModule_viewSmartAssistantSoundList/listbox.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSoundModule_viewSmartAssistantSoundList/listbox.xml index b95f8e2f7af..34fe76973f3 100644 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSoundModule_viewSmartAssistantSoundList/listbox.xml +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSoundModule_viewSmartAssistantSoundList/listbox.xml @@ -10,7 +10,8 @@ delegated_list - portal_type + columns + portal_types selection_name title @@ -65,6 +66,21 @@ values + + columns + + + + title + Title + + + validation_state + Validation State + + + + field_id my_list_mode_listbox @@ -84,6 +100,12 @@ + + portal_types + + + + selection_name smart_assistant_sound_module_selection diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view.xml index 9002a8ce941..9101ea36f59 100644 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view.xml +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view.xml @@ -73,6 +73,10 @@ my_title + your_player + your_modification_date + my_translated_validation_state_title + my_text_content diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view/my_text_content.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view/my_text_content.xml new file mode 100644 index 00000000000..0d9909c1b2c --- /dev/null +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view/my_text_content.xml @@ -0,0 +1,280 @@ + + + + + + + + + + id + my_text_content + + + message_values + + + + external_validator_failed + The input failed the external validator. + + + line_too_long + A line was too long. + + + required_not_found + Input is required but no input given. + + + too_long + You entered too many characters. + + + too_many_lines + You entered too many lines. + + + + + + overrides + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + height + + + + hidden + + + + max_length + + + + max_linelength + + + + max_lines + + + + required + + + + title + + + + unicode + + + + whitespace_preserve + + + + width + + + + + + + tales + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + height + + + + hidden + + + + max_length + + + + max_linelength + + + + max_lines + + + + required + + + + title + + + + unicode + + + + whitespace_preserve + + + + width + + + + + + + values + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + editable + 1 + + + enabled + 1 + + + external_validator + + + + extra + + + + height + 5 + + + hidden + 0 + + + max_length + + + + max_linelength + + + + max_lines + + + + required + 0 + + + title + Text Content + + + unicode + 0 + + + whitespace_preserve + 0 + + + width + 40 + + + + + + + + diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view/my_translated_validation_state_title.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view/my_translated_validation_state_title.xml new file mode 100644 index 00000000000..0a0660c9dac --- /dev/null +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view/my_translated_validation_state_title.xml @@ -0,0 +1,90 @@ + + + + + + + + + + delegated_list + + + + + + id + my_translated_validation_state_title + + + message_values + + + + external_validator_failed + The input failed the external validator. + + + + + + overrides + + + + field_id + + + + form_id + + + + target + + + + + + + tales + + + + field_id + + + + form_id + + + + target + + + + + + + values + + + + field_id + my_view_mode_translated_validation_state_title + + + form_id + Base_viewDMSFieldLibrary + + + target + Click to edit the target + + + + + + + + diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view/your_modification_date.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view/your_modification_date.xml new file mode 100644 index 00000000000..bafbb7652d6 --- /dev/null +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view/your_modification_date.xml @@ -0,0 +1,287 @@ + + + + + + + + + + id + your_modification_date + + + message_values + + + + external_validator_failed + The input failed the external validator. + + + required_not_found + Input is required but no input given. + + + too_long + Too much input was given. + + + + + + overrides + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + display_maxwidth + + + + display_width + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + hidden + + + + input_type + + + + max_length + + + + required + + + + title + + + + truncate + + + + unicode + + + + whitespace_preserve + + + + + + + tales + + + + alternate_name + + + + css_class + + + + default + + AAAAAAAAAAI= + + + + description + + + + display_maxwidth + + + + display_width + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + hidden + + + + input_type + + + + max_length + + + + required + + + + title + + + + truncate + + + + unicode + + + + whitespace_preserve + + + + + + + values + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + display_maxwidth + + + + display_width + 20 + + + editable + 1 + + + enabled + 1 + + + external_validator + + + + extra + + + + hidden + 0 + + + input_type + text + + + max_length + + + + required + 0 + + + title + Modification Date + + + truncate + 0 + + + unicode + 0 + + + whitespace_preserve + 0 + + + + + + + + + + + + + + + _text + python: here.getModificationDate().rfc822() + + + + + diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view/your_player.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view/your_player.xml new file mode 100644 index 00000000000..2c2fe3634ca --- /dev/null +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_view/your_player.xml @@ -0,0 +1,291 @@ + + + + + + + + + + id + your_player + + + message_values + + + + external_validator_failed + The input failed the external validator. + + + no_validator + Does not support this operation. + + + + + + overrides + + + + alternate_name + + + + css_class + + + + data_url + + + + default + + + + description + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + gadget_url + + + + hidden + + + + js_sandbox + + + + renderjs_extra + + + + title + + + + validator_field_id + + + + validator_form_id + + + + + + + tales + + + + alternate_name + + + + css_class + + + + data_url + + + + default + + AAAAAAAAAAI= + + + + description + + + + editable + + + + enabled + + AAAAAAAAAAM= + + + + external_validator + + + + extra + + + + gadget_url + + AAAAAAAAAAQ= + + + + hidden + + + + js_sandbox + + + + renderjs_extra + + + + title + + + + validator_field_id + + + + validator_form_id + + + + + + + values + + + + alternate_name + + + + css_class + + + + data_url + 0 + + + default + + + + description + + + + editable + 0 + + + enabled + 1 + + + external_validator + + + + extra + + + + gadget_url + + + + hidden + 0 + + + js_sandbox + + + + renderjs_extra + + + + + + title + Player + + + validator_field_id + + + + validator_form_id + + + + + + + + + + + + + + + + _text + here/getRelativeUrl + + + + + + + + + + + + _text + python:here.aq_parent.aq_parent.getPortalType() == \'Web Section\' + + + + + + + + + + + + _text + python:field.restrictedTraverse(\'gadget_custom_player.html\').absolute_url() + + + + + diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO.xml new file mode 100644 index 00000000000..267afcab4c9 --- /dev/null +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO.xml @@ -0,0 +1,134 @@ + + + + + + + + + + _objects + + + + + + action + Base_edit + + + description + + + + edit_order + + + + + + encoding + UTF-8 + + + enctype + + + + group_list + + + left + right + center + bottom + hidden + + + + + groups + + + + bottom + + + + + + center + + + + + + hidden + + + + + + left + + + my_title + your_modification_date + my_text_content + your_validation_state + + + + + right + + + + + + + + + id + SmartAssistantSound_viewAsJIO + + + method + POST + + + name + SmartAssistantSound_view + + + pt + form_view + + + row_length + 4 + + + stored_encoding + UTF-8 + + + title + Smart Assistant Sound + + + unicode_mode + 0 + + + update_action + + + + update_action_title + + + + + + diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/my_text_content.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/my_text_content.xml new file mode 100644 index 00000000000..0d9909c1b2c --- /dev/null +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/my_text_content.xml @@ -0,0 +1,280 @@ + + + + + + + + + + id + my_text_content + + + message_values + + + + external_validator_failed + The input failed the external validator. + + + line_too_long + A line was too long. + + + required_not_found + Input is required but no input given. + + + too_long + You entered too many characters. + + + too_many_lines + You entered too many lines. + + + + + + overrides + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + height + + + + hidden + + + + max_length + + + + max_linelength + + + + max_lines + + + + required + + + + title + + + + unicode + + + + whitespace_preserve + + + + width + + + + + + + tales + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + height + + + + hidden + + + + max_length + + + + max_linelength + + + + max_lines + + + + required + + + + title + + + + unicode + + + + whitespace_preserve + + + + width + + + + + + + values + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + editable + 1 + + + enabled + 1 + + + external_validator + + + + extra + + + + height + 5 + + + hidden + 0 + + + max_length + + + + max_linelength + + + + max_lines + + + + required + 0 + + + title + Text Content + + + unicode + 0 + + + whitespace_preserve + 0 + + + width + 40 + + + + + + + + diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/my_title.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/my_title.xml new file mode 100644 index 00000000000..4cc7d2e889b --- /dev/null +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/my_title.xml @@ -0,0 +1,272 @@ + + + + + + + + + + id + my_title + + + message_values + + + + external_validator_failed + The input failed the external validator. + + + required_not_found + Input is required but no input given. + + + too_long + Too much input was given. + + + + + + overrides + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + display_maxwidth + + + + display_width + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + hidden + + + + input_type + + + + max_length + + + + required + + + + title + + + + truncate + + + + unicode + + + + whitespace_preserve + + + + + + + tales + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + display_maxwidth + + + + display_width + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + hidden + + + + input_type + + + + max_length + + + + required + + + + title + + + + truncate + + + + unicode + + + + whitespace_preserve + + + + + + + values + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + display_maxwidth + + + + display_width + 20 + + + editable + 1 + + + enabled + 1 + + + external_validator + + + + extra + + + + hidden + 0 + + + input_type + text + + + max_length + + + + required + 0 + + + title + Title + + + truncate + 0 + + + unicode + 0 + + + whitespace_preserve + 0 + + + + + + + + diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_modification_date.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_modification_date.xml new file mode 100644 index 00000000000..bafbb7652d6 --- /dev/null +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_modification_date.xml @@ -0,0 +1,287 @@ + + + + + + + + + + id + your_modification_date + + + message_values + + + + external_validator_failed + The input failed the external validator. + + + required_not_found + Input is required but no input given. + + + too_long + Too much input was given. + + + + + + overrides + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + display_maxwidth + + + + display_width + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + hidden + + + + input_type + + + + max_length + + + + required + + + + title + + + + truncate + + + + unicode + + + + whitespace_preserve + + + + + + + tales + + + + alternate_name + + + + css_class + + + + default + + AAAAAAAAAAI= + + + + description + + + + display_maxwidth + + + + display_width + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + hidden + + + + input_type + + + + max_length + + + + required + + + + title + + + + truncate + + + + unicode + + + + whitespace_preserve + + + + + + + values + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + display_maxwidth + + + + display_width + 20 + + + editable + 1 + + + enabled + 1 + + + external_validator + + + + extra + + + + hidden + 0 + + + input_type + text + + + max_length + + + + required + 0 + + + title + Modification Date + + + truncate + 0 + + + unicode + 0 + + + whitespace_preserve + 0 + + + + + + + + + + + + + + + _text + python: here.getModificationDate().rfc822() + + + + + diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_player.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_player.xml new file mode 100644 index 00000000000..2c2fe3634ca --- /dev/null +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_player.xml @@ -0,0 +1,291 @@ + + + + + + + + + + id + your_player + + + message_values + + + + external_validator_failed + The input failed the external validator. + + + no_validator + Does not support this operation. + + + + + + overrides + + + + alternate_name + + + + css_class + + + + data_url + + + + default + + + + description + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + gadget_url + + + + hidden + + + + js_sandbox + + + + renderjs_extra + + + + title + + + + validator_field_id + + + + validator_form_id + + + + + + + tales + + + + alternate_name + + + + css_class + + + + data_url + + + + default + + AAAAAAAAAAI= + + + + description + + + + editable + + + + enabled + + AAAAAAAAAAM= + + + + external_validator + + + + extra + + + + gadget_url + + AAAAAAAAAAQ= + + + + hidden + + + + js_sandbox + + + + renderjs_extra + + + + title + + + + validator_field_id + + + + validator_form_id + + + + + + + values + + + + alternate_name + + + + css_class + + + + data_url + 0 + + + default + + + + description + + + + editable + 0 + + + enabled + 1 + + + external_validator + + + + extra + + + + gadget_url + + + + hidden + 0 + + + js_sandbox + + + + renderjs_extra + + + + + + title + Player + + + validator_field_id + + + + validator_form_id + + + + + + + + + + + + + + + + _text + here/getRelativeUrl + + + + + + + + + + + + _text + python:here.aq_parent.aq_parent.getPortalType() == \'Web Section\' + + + + + + + + + + + + _text + python:field.restrictedTraverse(\'gadget_custom_player.html\').absolute_url() + + + + + diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_validation_state.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_validation_state.xml new file mode 100644 index 00000000000..395d098ebab --- /dev/null +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_validation_state.xml @@ -0,0 +1,287 @@ + + + + + + + + + + id + your_validation_state + + + message_values + + + + external_validator_failed + The input failed the external validator. + + + required_not_found + Input is required but no input given. + + + too_long + Too much input was given. + + + + + + overrides + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + display_maxwidth + + + + display_width + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + hidden + + + + input_type + + + + max_length + + + + required + + + + title + + + + truncate + + + + unicode + + + + whitespace_preserve + + + + + + + tales + + + + alternate_name + + + + css_class + + + + default + + AAAAAAAAAAI= + + + + description + + + + display_maxwidth + + + + display_width + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + hidden + + + + input_type + + + + max_length + + + + required + + + + title + + + + truncate + + + + unicode + + + + whitespace_preserve + + + + + + + values + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + display_maxwidth + + + + display_width + 20 + + + editable + 0 + + + enabled + 1 + + + external_validator + + + + extra + + + + hidden + 0 + + + input_type + text + + + max_length + + + + required + 0 + + + title + Validation State + + + truncate + 0 + + + unicode + 0 + + + whitespace_preserve + 0 + + + + + + + + + + + + + + + _text + python: here.getValidationState() + + + + + diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantTextModule_viewSmartAssistantTextList/listbox.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantTextModule_viewSmartAssistantTextList/listbox.xml index 6a38c54818f..941d57c7f5f 100644 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantTextModule_viewSmartAssistantTextList/listbox.xml +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantTextModule_viewSmartAssistantTextList/listbox.xml @@ -10,7 +10,7 @@ delegated_list - portal_type + columns selection_name title @@ -65,6 +65,21 @@ values + + columns + + + + title + Title + + + validation_state + Validation State + + + + field_id my_list_mode_listbox diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_view.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_view.xml index b8a95376e58..ae9d31102f3 100644 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_view.xml +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_view.xml @@ -73,7 +73,9 @@ my_title + your_modification_date my_text_content + my_translated_validation_state_title diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_view/my_translated_validation_state_title.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_view/my_translated_validation_state_title.xml new file mode 100644 index 00000000000..0a0660c9dac --- /dev/null +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_view/my_translated_validation_state_title.xml @@ -0,0 +1,90 @@ + + + + + + + + + + delegated_list + + + + + + id + my_translated_validation_state_title + + + message_values + + + + external_validator_failed + The input failed the external validator. + + + + + + overrides + + + + field_id + + + + form_id + + + + target + + + + + + + tales + + + + field_id + + + + form_id + + + + target + + + + + + + values + + + + field_id + my_view_mode_translated_validation_state_title + + + form_id + Base_viewDMSFieldLibrary + + + target + Click to edit the target + + + + + + + + diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_view/your_modification_date.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_view/your_modification_date.xml new file mode 100644 index 00000000000..bafbb7652d6 --- /dev/null +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_view/your_modification_date.xml @@ -0,0 +1,287 @@ + + + + + + + + + + id + your_modification_date + + + message_values + + + + external_validator_failed + The input failed the external validator. + + + required_not_found + Input is required but no input given. + + + too_long + Too much input was given. + + + + + + overrides + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + display_maxwidth + + + + display_width + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + hidden + + + + input_type + + + + max_length + + + + required + + + + title + + + + truncate + + + + unicode + + + + whitespace_preserve + + + + + + + tales + + + + alternate_name + + + + css_class + + + + default + + AAAAAAAAAAI= + + + + description + + + + display_maxwidth + + + + display_width + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + hidden + + + + input_type + + + + max_length + + + + required + + + + title + + + + truncate + + + + unicode + + + + whitespace_preserve + + + + + + + values + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + display_maxwidth + + + + display_width + 20 + + + editable + 1 + + + enabled + 1 + + + external_validator + + + + extra + + + + hidden + 0 + + + input_type + text + + + max_length + + + + required + 0 + + + title + Modification Date + + + truncate + 0 + + + unicode + 0 + + + whitespace_preserve + 0 + + + + + + + + + + + + + + + _text + python: here.getModificationDate().rfc822() + + + + + diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO.xml index d00da072536..47235d74c40 100644 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO.xml +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO.xml @@ -75,6 +75,7 @@ my_title my_text_content your_modification_date + your_validation_state diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/your_validation_state.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/your_validation_state.xml new file mode 100644 index 00000000000..395d098ebab --- /dev/null +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/your_validation_state.xml @@ -0,0 +1,287 @@ + + + + + + + + + + id + your_validation_state + + + message_values + + + + external_validator_failed + The input failed the external validator. + + + required_not_found + Input is required but no input given. + + + too_long + Too much input was given. + + + + + + overrides + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + display_maxwidth + + + + display_width + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + hidden + + + + input_type + + + + max_length + + + + required + + + + title + + + + truncate + + + + unicode + + + + whitespace_preserve + + + + + + + tales + + + + alternate_name + + + + css_class + + + + default + + AAAAAAAAAAI= + + + + description + + + + display_maxwidth + + + + display_width + + + + editable + + + + enabled + + + + external_validator + + + + extra + + + + hidden + + + + input_type + + + + max_length + + + + required + + + + title + + + + truncate + + + + unicode + + + + whitespace_preserve + + + + + + + values + + + + alternate_name + + + + css_class + + + + default + + + + description + + + + display_maxwidth + + + + display_width + 20 + + + editable + 0 + + + enabled + 1 + + + external_validator + + + + extra + + + + hidden + 0 + + + input_type + text + + + max_length + + + + required + 0 + + + title + Validation State + + + truncate + 0 + + + unicode + 0 + + + whitespace_preserve + 0 + + + + + + + + + + + + + + + _text + python: here.getValidationState() + + + + + -- 2.30.9 From 844c00e19b993d59e40eebd5ab5a28d451820702 Mon Sep 17 00:00:00 2001 From: "lu.xu" Date: Wed, 3 Jul 2019 12:54:09 +0000 Subject: [PATCH 03/10] erp5_officejs_ui_test: update test for text module --- .../testOfficeJSSmartAssistant.zpt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_smartassistant_zuite/testOfficeJSSmartAssistant.zpt b/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_smartassistant_zuite/testOfficeJSSmartAssistant.zpt index 9fabc9875b4..bb9bc2ccf24 100644 --- a/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_smartassistant_zuite/testOfficeJSSmartAssistant.zpt +++ b/bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_smartassistant_zuite/testOfficeJSSmartAssistant.zpt @@ -129,6 +129,8 @@ link=${title} - - - \ No newline at end of file + + waitForElementPresent + //pre[contains(text(), "This is a test too simple")] + + \ No newline at end of file -- 2.30.9 From 97618c2d4f75d32123ffa290128da2a99553dd5a Mon Sep 17 00:00:00 2001 From: "lu.xu" Date: Wed, 3 Jul 2019 14:31:33 +0000 Subject: [PATCH 04/10] erp5_officejs:implement App on officeJS --- ...s_erp5_page_smart_assistant_home_html.html | 8 +- ...js_erp5_page_smart_assistant_home_html.xml | 4 +- ...icejs_erp5_page_smart_assistant_home_js.js | 113 +++++++++++++++++- ...cejs_erp5_page_smart_assistant_home_js.xml | 50 +------- ...ficejs_jio_smart_assistant_text_view_js.js | 43 ++++--- ...icejs_jio_smart_assistant_text_view_js.xml | 4 +- ...s_page_jio_erp5_smart_assistant_text_js.js | 4 +- ..._page_jio_erp5_smart_assistant_text_js.xml | 4 +- ...dget_officejs_panel_smart_assistant_js.xml | 30 ++--- 9 files changed, 169 insertions(+), 91 deletions(-) diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_html.html b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_html.html index ac4261454e3..9eaa066e945 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_html.html +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_html.html @@ -31,6 +31,12 @@ class='ui-flex-center'> - +
+
+
+
diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_html.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_html.xml index a6d28b5207f..3c7b159338b 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_html.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_html.xml @@ -273,7 +273,7 @@ serial - 967.17859.46531.61866 + 976.22725.48476.52138 state @@ -291,7 +291,7 @@ - 1525278837.04 + 1560351706.09 UTC diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_js.js index d8ef3acb2a4..e098e1f6e21 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_js.js @@ -1,6 +1,6 @@ -/*global window, rJS, jIO, Handlebars, RSVP, Blob*/ +/*global window, rJS, jIO, Handlebars, RSVP, Blob, SimpleQuery, ComplexQuery, Query*/ /*jslint indent:2, maxlen: 80, nomen: true */ -(function (window, rJS, jIO, RSVP) { +(function (window, rJS, jIO, RSVP, SimpleQuery, ComplexQuery, Query) { "use strict"; rJS(window) @@ -18,8 +18,44 @@ .declareAcquiredMethod("notifyChange", "notifyChange") .declareAcquiredMethod("notifySubmitted", "notifySubmitted") .declareAcquiredMethod("getUrlFor", "getUrlFor") + .declareAcquiredMethod("getUrlParameter", "getUrlParameter") + .declareAcquiredMethod("jio_allDocs", "jio_allDocs") - + .allowPublicAcquisition("jio_allDocs", function (param_list) { + var gadget = this; + return gadget.jio_allDocs(param_list[0]) + .push(function (result) { + var i, date, len = result.data.total_rows; + for (i = 0; i < len; i += 1) { + if (result.data.rows[i].value.hasOwnProperty("modification_date")) { + date = new Date(result.data.rows[i].value.modification_date); + result.data.rows[i].value.modification_date = { + field_gadget_param: { + allow_empty_time: 0, + ampm_time_style: 0, + css_class: "date_field", + date_only: 0, + description: "The Date", + editable: 0, + hidden: 0, + hidden_day_is_last_day: 0, + "default": date.toUTCString(), + key: "modification_date", + required: 0, + timezone_style: 0, + title: "Modification Date", + type: "DateTimeField" + } + }; + result.data.rows[i].value["listbox_uid:list"] = { + key: "listbox_uid:list", + value: 2713 + }; + } + } + return result; + }); + }) .allowPublicAcquisition('updateHeader', function () { return; @@ -98,8 +134,11 @@ }; }); }) + .declareMethod("render", function () { var gadget = this; + this.getDeclaredGadget('form_list'); + return gadget.getSetting('jio_storage_name') .push(function (result) { if (!result) { @@ -110,10 +149,38 @@ .push(function () { return RSVP.all([ gadget.getDeclaredGadget('form_view_upload_audio'), - gadget.getDeclaredGadget('form_view_image_text') + gadget.getDeclaredGadget('form_view_image_text'), + gadget.getDeclaredGadget('form_list'),//added + gadget.getSetting("portal_type") ]); }) .push(function (result) { + var column_list = [ + ['title', 'Title'], + ['modification_date', 'Modification Date'], + ['validation_state', 'Validation State'] + ], + + portal_type = result[3].split(','), + query = "urn:jio:allDocs?query=", + i, + jio_query_list = []; + + for (i = 0; i < portal_type.length; i += 1) { + jio_query_list.push(new SimpleQuery({ + key: "portal_type", + operator: "", + type: "simple", + value: portal_type[i] + })); + } + + query += Query.objectToSearchText(new ComplexQuery({ + operator: "OR", + query_list: jio_query_list, + type: "complex" + })); + return RSVP.all([ result[0].render({ erp5_document: {"_embedded": {"_view": { @@ -194,6 +261,42 @@ [["text"]] ]] } + }), + + result[2].render({ + erp5_document: { + "_embedded": {"_view": { + "listbox": { + "column_list": column_list, + "show_anchor": 0, + "default_params": {}, + "editable": 1, + "editable_column_list": [], + "key": "field_listbox", + "lines": 30, + "list_method": "portal_catalog", + "query": query, + "portal_type": [], + "search_column_list": column_list, + "sort_column_list": column_list, + "sort": [['modification_date', 'descending']], + "title": "Notification", + "type": "ListBox" + } + }}, + "_links": { + "type": { + // form_list display portal_type in header + name: "" + } + } + }, + form_definition: { + group_list: [[ + "bottom", + [["listbox"]] + ]] + } }) ]); }) @@ -216,4 +319,4 @@ }); -}(window, rJS, jIO, RSVP)); \ No newline at end of file +}(window, rJS, jIO, RSVP, SimpleQuery, ComplexQuery, Query)); diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_js.xml index 2906af39162..9e528704c27 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_js.xml @@ -58,29 +58,12 @@ - - categories - - - contributor/person_module/1 - classification/collaborative/team - - - content_md5 - - creators - - - cedric.le.ninivin - - - default_reference gadget_erp5_page_ojs_smart_assistant_home.js @@ -101,25 +84,6 @@ - - modification_date - - - - - - - - - - - 1455284352.18 - UTC - - - - - portal_type Web Script @@ -134,12 +98,6 @@ title Gadget Smart Assistant JS - - url_string - - - - version 001 @@ -224,7 +182,7 @@ - 1519634719.01 + 1562159205.06 UTC @@ -269,7 +227,7 @@ serial - 967.20676.40581.32768 + 976.54308.37653.52753 state @@ -287,7 +245,7 @@ - 1525444169.16 + 1562162159.44 UTC @@ -344,7 +302,7 @@ - 1519633924.76 + 1562158825.48 UTC diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_text_view_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_text_view_js.js index dacc558452e..7040264f67a 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_text_view_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_text_view_js.js @@ -12,7 +12,8 @@ .declareAcquiredMethod("getUrlFor", "getUrlFor") .declareAcquiredMethod("updateDocument", "updateDocument") .declareAcquiredMethod("notifySubmitting", "notifySubmitting") - .declareAcquiredMethod("notifySubmitted", 'notifySubmitted') + .declareAcquiredMethod("notifySubmitted", "notifySubmitted") + .declareAcquiredMethod("redirect", "redirect") .declareAcquiredMethod("jio_get", "jio_get") @@ -52,8 +53,7 @@ }) .onEvent('submit', function () { - var gadget = this, - title; + var gadget = this; return gadget.notifySubmitting() .push(function () { @@ -63,14 +63,9 @@ return form_gadget.getContent(); }) .push(function (result) { - title = result.title; - - if (result.text_ === "") { - result.text_ = " "; - } + var reply = result.reply; return gadget.updateDocument({ - 'text_content': result.text_, - title: title + 'text_content': gadget.state.content.text_content + "\n" + reply }); }) .push(function () { @@ -78,6 +73,9 @@ "message": "Data Updated", "status": "success" }); + }) + .push(function () { + return gadget.redirect({command: 'reload'}); }); }) .declareMethod("triggerSubmit", function () { @@ -104,15 +102,25 @@ "hidden": 0, "type": "StringField" }, - "my_text": { - "default": gadget.state.text, + "my_text_content": { + "default": gadget.state.content.text_content, + "css_class": "", + "required": 0, + "editable": 0, + "key": "text_content", + "hidden": 0, + "title": 'History', + "type": "TextAreaField" + }, + "my_reply": { + "default": "", + "title": "Reply", "css_class": "", "required": 0, "editable": 1, - "key": "text_", + "key": "reply", "hidden": 0, - "renderjs_extra": '{"editor": "fck_editor",' + - '"maximize": "auto"}', + "renderjs_extra": '{"editor": "fck_editor"}', "type": "GadgetField", "url": "gadget_editor.html", "sandbox": "public" @@ -130,9 +138,12 @@ group_list: [[ "left", [["my_title"]] + ], [ + "center", + [["my_text_content"]] ], [ "bottom", - [["my_text"]] + [["my_reply"]] ]] } }); diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_text_view_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_text_view_js.xml index 802362b37fa..a7e4d8d0f52 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_text_view_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_text_view_js.xml @@ -239,7 +239,7 @@ serial - 966.50123.54319.23415 + 976.31373.10382.14609 state @@ -257,7 +257,7 @@ - 1523439452.07 + 1560873588.93 UTC diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_smart_assistant_text_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_smart_assistant_text_js.js index 0e1cd85ed16..61752e31b91 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_smart_assistant_text_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_smart_assistant_text_js.js @@ -85,7 +85,7 @@ return form_gadget.render({ erp5_document: { "_embedded": {"_view": { - "my_content": { + "my_text_content": { "default": "", "css_class": "", "required": 0, @@ -118,7 +118,7 @@ [["my_description"]] ], [ "bottom", - [["my_content"]] + [["my_text_content"]] ]] } }); diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_smart_assistant_text_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_smart_assistant_text_js.xml index 935746c3852..c047a07ba0e 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_smart_assistant_text_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_jio_erp5_smart_assistant_text_js.xml @@ -239,7 +239,7 @@ serial - 967.17930.59246.1075 + 976.14145.4153.46813 state @@ -257,7 +257,7 @@ - 1525279476.09 + 1559836938.79 UTC diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_panel_smart_assistant_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_panel_smart_assistant_js.xml index 16b7fa7102b..7a0b08bfad3 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_panel_smart_assistant_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_panel_smart_assistant_js.xml @@ -58,20 +58,16 @@ - - categories - - - classification/collaborative/team - - - content_md5 + + content_type + application/javascript + default_reference gadget_erp5_ojs_panel_smart_assistant.js @@ -88,7 +84,9 @@ language - en + + + portal_type @@ -188,7 +186,7 @@ - 1520002302.38 + 1562163551.28 UTC @@ -233,7 +231,7 @@ serial - 966.14275.9143.23296 + 976.54306.32835.10854 state @@ -251,7 +249,7 @@ - 1522761698.8 + 1562160158.27 UTC @@ -274,7 +272,9 @@ action - detect_converted_file + + + actor @@ -290,7 +290,7 @@ external_processing_state - converted + empty serial @@ -308,7 +308,7 @@ - 1520001217.02 + 1562159899.76 UTC -- 2.30.9 From 3cc871808c03681d8f520884c9b79ff385199a97 Mon Sep 17 00:00:00 2001 From: Romain Courteaud Date: Mon, 7 Nov 2016 13:42:56 +0000 Subject: [PATCH 05/10] [HARDCODED] Reduce number of test to run --- tests/__init__.py | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/tests/__init__.py b/tests/__init__.py index 580935d622e..f25780b6f8b 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,12 +1,13 @@ from glob import glob import os, subprocess, re # test_suite is provided by 'run_test_suite' -from test_suite import ERP5TypeTestSuite +from test_suite import SavedTestSuite import sys HERE = os.path.dirname(__file__) -class _ERP5(ERP5TypeTestSuite): +class _ERP5(SavedTestSuite): + _saved_test_id = "erp5_web_renderjs_ui_test:testFunctionalRJSInterfaceValidator" realtime_output = False enabled_product_list = ('CMFActivity', 'CMFCategory', 'ERP5', 'ERP5Catalog', 'ERP5eGovSecurity', 'ERP5Form', @@ -35,9 +36,29 @@ class _ERP5(ERP5TypeTestSuite): component_re = re.compile(".*/([^/]+)/TestTemplateItem/portal_components" "/test\.[^.]+\.([^.]+).py$") for test_path in ( - glob('%s/product/*/tests/test*.py' % path) + - glob('%s/bt5/*/TestTemplateItem/test*.py' % path) + - glob('%s/bt5/*/TestTemplateItem/portal_components/test.*.test*.py' % path)): + # glob('%s/product/Formulator/tests/test*.py' % path) + + # glob('%s/product/ERP5Form/tests/test*.py' % path) + + # ['%s/product/ERP5/tests/testXHTML.py' % path] + + # ['%s/product/ERP5Type/tests/testFunctionalCore.py' % path] + + # ['%s/product/ERP5Type/tests/testFunctionalAnonymousSelection.py' % path] + + # glob('%s/bt5/erp5_web/TestTemplateItem/portal_components/test.*.test*.py' % path) + + # glob('%s/bt5/erp5_web_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + glob('%s/bt5/erp5_hal_json_style/TestTemplateItem/portal_components/test.*.test*.py' % path) + + glob('%s/bt5/erp5_web_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + # glob('%s/bt5/erp5_web_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + # glob('%s/bt5/erp5_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + # glob('%s/bt5/erp5_token_login/TestTemplateItem/portal_components/test.*.test*.py' % path) + + glob('%s/bt5/erp5_trade_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + glob('%s/bt5/erp5_pdm_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + glob('%s/bt5/erp5_crm_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + glob('%s/bt5/erp5_accounting_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + glob('%s/bt5/erp5_gadget_interface_validator_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + # glob('%s/bt5/erp5_web_monitoring_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + # glob('%s/bt5/erp5_travel_expense_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + # glob('%s/bt5/erp5_officejs_support_request_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + # glob('%s/bt5/erp5_officejs_afs_directory_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + # glob('%s/bt5/erp5_officejs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + ): component_re_match = component_re.match(test_path) if component_re_match is not None: test_case = "%s:%s" % (component_re_match.group(1), -- 2.30.9 From 2bad594bbfe6fc6e14ad187cf4c46a6ede30595d Mon Sep 17 00:00:00 2001 From: "lu.xu" Date: Wed, 3 Jul 2019 17:26:23 +0200 Subject: [PATCH 06/10] [HARDCODED] Reduce number of test to run updated --- tests/__init__.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/__init__.py b/tests/__init__.py index f25780b6f8b..f29a42b93a2 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -43,21 +43,21 @@ class _ERP5(SavedTestSuite): # ['%s/product/ERP5Type/tests/testFunctionalAnonymousSelection.py' % path] + # glob('%s/bt5/erp5_web/TestTemplateItem/portal_components/test.*.test*.py' % path) + # glob('%s/bt5/erp5_web_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + - glob('%s/bt5/erp5_hal_json_style/TestTemplateItem/portal_components/test.*.test*.py' % path) + - glob('%s/bt5/erp5_web_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + # glob('%s/bt5/erp5_hal_json_style/TestTemplateItem/portal_components/test.*.test*.py' % path) + + # glob('%s/bt5/erp5_web_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + # glob('%s/bt5/erp5_web_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + # glob('%s/bt5/erp5_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + # glob('%s/bt5/erp5_token_login/TestTemplateItem/portal_components/test.*.test*.py' % path) + - glob('%s/bt5/erp5_trade_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + - glob('%s/bt5/erp5_pdm_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + - glob('%s/bt5/erp5_crm_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + - glob('%s/bt5/erp5_accounting_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + - glob('%s/bt5/erp5_gadget_interface_validator_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + # glob('%s/bt5/erp5_trade_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + # glob('%s/bt5/erp5_pdm_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + # glob('%s/bt5/erp5_crm_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + # glob('%s/bt5/erp5_accounting_renderjs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + + # glob('%s/bt5/erp5_gadget_interface_validator_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) # glob('%s/bt5/erp5_web_monitoring_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + # glob('%s/bt5/erp5_travel_expense_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + # glob('%s/bt5/erp5_officejs_support_request_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + # glob('%s/bt5/erp5_officejs_afs_directory_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + - # glob('%s/bt5/erp5_officejs_ui_test/TestTemplateItem/portal_components/test.*.test*.py' % path) + glob('%s/bt5/erp5_officejs_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalOfficeJSSmartAssistant.py' % path) ): component_re_match = component_re.match(test_path) if component_re_match is not None: -- 2.30.9 From 47969bd82af2d993a093c3c250b62a8a23056371 Mon Sep 17 00:00:00 2001 From: "lu.xu" Date: Wed, 17 Jul 2019 15:13:48 +0000 Subject: [PATCH 07/10] erp5_smart_assistant: implement download and omit creation_date listbox --- .../Smart%20Assistant%20File/download.xml | 100 ++++++++++++++++++ ...tFileModule_viewSmartAssistantFileList.xml | 1 - .../listbox_creation_date.xml | 90 ---------------- .../bt/template_action_path_list | 1 + 4 files changed, 101 insertions(+), 91 deletions(-) create mode 100644 bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20File/download.xml delete mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList/listbox_creation_date.xml diff --git a/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20File/download.xml b/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20File/download.xml new file mode 100644 index 00000000000..37115b190c9 --- /dev/null +++ b/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20File/download.xml @@ -0,0 +1,100 @@ + + + + + + + + + + action + + AAAAAAAAAAI= + + + + categories + + + action_type/object_jio_exchange + + + + + category + object_jio_exchange + + + condition + + AAAAAAAAAAM= + + + + description + + + + + + icon + + + + id + download + + + permissions + + + View + + + + + portal_type + Action Information + + + priority + 20.0 + + + title + Download Original File + + + visible + 1 + + + + + + + + + + + + text + string:${object_url}/Document_viewDownloadDialog + + + + + + + + + + + + text + python:object.hasFile() + + + + + diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList.xml index fa292a6d704..9e22250724c 100644 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList.xml +++ b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList.xml @@ -61,7 +61,6 @@ listbox - listbox_creation_date diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList/listbox_creation_date.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList/listbox_creation_date.xml deleted file mode 100644 index 06545e5412d..00000000000 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_file/SmartAssistantFileModule_viewSmartAssistantFileList/listbox_creation_date.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - delegated_list - - - - - - id - listbox_creation_date - - - message_values - - - - external_validator_failed - The input failed the external validator. - - - - - - overrides - - - - field_id - - - - form_id - - - - target - - - - - - - tales - - - - field_id - - - - form_id - - - - target - - - - - - - values - - - - field_id - my_view_mode_listbox_read_only_creation_date - - - form_id - Base_viewDMSFieldLibrary - - - target - Click to edit the target - - - - - - - - diff --git a/bt5/erp5_smart_assistant/bt/template_action_path_list b/bt5/erp5_smart_assistant/bt/template_action_path_list index 61b028f355a..d0d008f9133 100644 --- a/bt5/erp5_smart_assistant/bt/template_action_path_list +++ b/bt5/erp5_smart_assistant/bt/template_action_path_list @@ -1,4 +1,5 @@ Smart Assistant File Module | view +Smart Assistant File | download Smart Assistant File | jio_view Smart Assistant File | view Smart Assistant Image Module | view -- 2.30.9 From f8b53e2445c25d4b6b0f4683aa772a4ceff46e75 Mon Sep 17 00:00:00 2001 From: "lu.xu" Date: Fri, 26 Jul 2019 09:33:28 +0000 Subject: [PATCH 08/10] erp5_smart_assistant: United JIO view to File_viewAsJIO --- .../Smart%20Assistant%20Sound/jio_view.xml | 2 +- .../Smart%20Assistant%20Text/jio_view.xml | 2 +- .../SmartAssistantSound_viewAsJIO.xml | 134 -------- .../my_text_content.xml | 280 ----------------- .../my_title.xml | 272 ---------------- .../your_modification_date.xml | 287 ----------------- .../your_player.xml | 291 ------------------ .../your_validation_state.xml | 287 ----------------- .../SmartAssistantText_viewAsJIO.xml | 134 -------- .../my_text_content.xml | 280 ----------------- .../SmartAssistantText_viewAsJIO/my_title.xml | 272 ---------------- .../your_modification_date.xml | 287 ----------------- .../your_validation_state.xml | 287 ----------------- 13 files changed, 2 insertions(+), 2813 deletions(-) delete mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO.xml delete mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/my_text_content.xml delete mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/my_title.xml delete mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_modification_date.xml delete mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_player.xml delete mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_validation_state.xml delete mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO.xml delete mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/my_text_content.xml delete mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/my_title.xml delete mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/your_modification_date.xml delete mode 100644 bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/your_validation_state.xml diff --git a/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Sound/jio_view.xml b/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Sound/jio_view.xml index f2174bca28a..3d40b8513bf 100644 --- a/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Sound/jio_view.xml +++ b/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Sound/jio_view.xml @@ -77,7 +77,7 @@ text - string:${object_url}/SmartAssistantSound_viewAsJIO + string:${object_url}/File_viewAsJIO diff --git a/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Text/jio_view.xml b/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Text/jio_view.xml index 78b5f9f4963..5843054dfb8 100644 --- a/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Text/jio_view.xml +++ b/bt5/erp5_smart_assistant/ActionTemplateItem/portal_types/Smart%20Assistant%20Text/jio_view.xml @@ -77,7 +77,7 @@ text - string:${object_url}/SmartAssistantText_viewAsJIO + string:${object_url}/File_viewAsJIO diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO.xml deleted file mode 100644 index 267afcab4c9..00000000000 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - - - _objects - - - - - - action - Base_edit - - - description - - - - edit_order - - - - - - encoding - UTF-8 - - - enctype - - - - group_list - - - left - right - center - bottom - hidden - - - - - groups - - - - bottom - - - - - - center - - - - - - hidden - - - - - - left - - - my_title - your_modification_date - my_text_content - your_validation_state - - - - - right - - - - - - - - - id - SmartAssistantSound_viewAsJIO - - - method - POST - - - name - SmartAssistantSound_view - - - pt - form_view - - - row_length - 4 - - - stored_encoding - UTF-8 - - - title - Smart Assistant Sound - - - unicode_mode - 0 - - - update_action - - - - update_action_title - - - - - - diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/my_text_content.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/my_text_content.xml deleted file mode 100644 index 0d9909c1b2c..00000000000 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/my_text_content.xml +++ /dev/null @@ -1,280 +0,0 @@ - - - - - - - - - - id - my_text_content - - - message_values - - - - external_validator_failed - The input failed the external validator. - - - line_too_long - A line was too long. - - - required_not_found - Input is required but no input given. - - - too_long - You entered too many characters. - - - too_many_lines - You entered too many lines. - - - - - - overrides - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - height - - - - hidden - - - - max_length - - - - max_linelength - - - - max_lines - - - - required - - - - title - - - - unicode - - - - whitespace_preserve - - - - width - - - - - - - tales - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - height - - - - hidden - - - - max_length - - - - max_linelength - - - - max_lines - - - - required - - - - title - - - - unicode - - - - whitespace_preserve - - - - width - - - - - - - values - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - editable - 1 - - - enabled - 1 - - - external_validator - - - - extra - - - - height - 5 - - - hidden - 0 - - - max_length - - - - max_linelength - - - - max_lines - - - - required - 0 - - - title - Text Content - - - unicode - 0 - - - whitespace_preserve - 0 - - - width - 40 - - - - - - - - diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/my_title.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/my_title.xml deleted file mode 100644 index 4cc7d2e889b..00000000000 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/my_title.xml +++ /dev/null @@ -1,272 +0,0 @@ - - - - - - - - - - id - my_title - - - message_values - - - - external_validator_failed - The input failed the external validator. - - - required_not_found - Input is required but no input given. - - - too_long - Too much input was given. - - - - - - overrides - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - display_maxwidth - - - - display_width - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - hidden - - - - input_type - - - - max_length - - - - required - - - - title - - - - truncate - - - - unicode - - - - whitespace_preserve - - - - - - - tales - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - display_maxwidth - - - - display_width - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - hidden - - - - input_type - - - - max_length - - - - required - - - - title - - - - truncate - - - - unicode - - - - whitespace_preserve - - - - - - - values - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - display_maxwidth - - - - display_width - 20 - - - editable - 1 - - - enabled - 1 - - - external_validator - - - - extra - - - - hidden - 0 - - - input_type - text - - - max_length - - - - required - 0 - - - title - Title - - - truncate - 0 - - - unicode - 0 - - - whitespace_preserve - 0 - - - - - - - - diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_modification_date.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_modification_date.xml deleted file mode 100644 index bafbb7652d6..00000000000 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_modification_date.xml +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - - - - id - your_modification_date - - - message_values - - - - external_validator_failed - The input failed the external validator. - - - required_not_found - Input is required but no input given. - - - too_long - Too much input was given. - - - - - - overrides - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - display_maxwidth - - - - display_width - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - hidden - - - - input_type - - - - max_length - - - - required - - - - title - - - - truncate - - - - unicode - - - - whitespace_preserve - - - - - - - tales - - - - alternate_name - - - - css_class - - - - default - - AAAAAAAAAAI= - - - - description - - - - display_maxwidth - - - - display_width - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - hidden - - - - input_type - - - - max_length - - - - required - - - - title - - - - truncate - - - - unicode - - - - whitespace_preserve - - - - - - - values - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - display_maxwidth - - - - display_width - 20 - - - editable - 1 - - - enabled - 1 - - - external_validator - - - - extra - - - - hidden - 0 - - - input_type - text - - - max_length - - - - required - 0 - - - title - Modification Date - - - truncate - 0 - - - unicode - 0 - - - whitespace_preserve - 0 - - - - - - - - - - - - - - - _text - python: here.getModificationDate().rfc822() - - - - - diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_player.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_player.xml deleted file mode 100644 index 2c2fe3634ca..00000000000 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_player.xml +++ /dev/null @@ -1,291 +0,0 @@ - - - - - - - - - - id - your_player - - - message_values - - - - external_validator_failed - The input failed the external validator. - - - no_validator - Does not support this operation. - - - - - - overrides - - - - alternate_name - - - - css_class - - - - data_url - - - - default - - - - description - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - gadget_url - - - - hidden - - - - js_sandbox - - - - renderjs_extra - - - - title - - - - validator_field_id - - - - validator_form_id - - - - - - - tales - - - - alternate_name - - - - css_class - - - - data_url - - - - default - - AAAAAAAAAAI= - - - - description - - - - editable - - - - enabled - - AAAAAAAAAAM= - - - - external_validator - - - - extra - - - - gadget_url - - AAAAAAAAAAQ= - - - - hidden - - - - js_sandbox - - - - renderjs_extra - - - - title - - - - validator_field_id - - - - validator_form_id - - - - - - - values - - - - alternate_name - - - - css_class - - - - data_url - 0 - - - default - - - - description - - - - editable - 0 - - - enabled - 1 - - - external_validator - - - - extra - - - - gadget_url - - - - hidden - 0 - - - js_sandbox - - - - renderjs_extra - - - - - - title - Player - - - validator_field_id - - - - validator_form_id - - - - - - - - - - - - - - - - _text - here/getRelativeUrl - - - - - - - - - - - - _text - python:here.aq_parent.aq_parent.getPortalType() == \'Web Section\' - - - - - - - - - - - - _text - python:field.restrictedTraverse(\'gadget_custom_player.html\').absolute_url() - - - - - diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_validation_state.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_validation_state.xml deleted file mode 100644 index 395d098ebab..00000000000 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_sound/SmartAssistantSound_viewAsJIO/your_validation_state.xml +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - - - - id - your_validation_state - - - message_values - - - - external_validator_failed - The input failed the external validator. - - - required_not_found - Input is required but no input given. - - - too_long - Too much input was given. - - - - - - overrides - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - display_maxwidth - - - - display_width - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - hidden - - - - input_type - - - - max_length - - - - required - - - - title - - - - truncate - - - - unicode - - - - whitespace_preserve - - - - - - - tales - - - - alternate_name - - - - css_class - - - - default - - AAAAAAAAAAI= - - - - description - - - - display_maxwidth - - - - display_width - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - hidden - - - - input_type - - - - max_length - - - - required - - - - title - - - - truncate - - - - unicode - - - - whitespace_preserve - - - - - - - values - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - display_maxwidth - - - - display_width - 20 - - - editable - 0 - - - enabled - 1 - - - external_validator - - - - extra - - - - hidden - 0 - - - input_type - text - - - max_length - - - - required - 0 - - - title - Validation State - - - truncate - 0 - - - unicode - 0 - - - whitespace_preserve - 0 - - - - - - - - - - - - - - - _text - python: here.getValidationState() - - - - - diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO.xml deleted file mode 100644 index 47235d74c40..00000000000 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - - - _objects - - - - - - action - Base_edit - - - description - - - - edit_order - - - - - - encoding - UTF-8 - - - enctype - - - - group_list - - - left - right - center - bottom - hidden - - - - - groups - - - - bottom - - - - - - center - - - - - - hidden - - - - - - left - - - my_title - my_text_content - your_modification_date - your_validation_state - - - - - right - - - - - - - - - id - SmartAssistantText_viewAsJIO - - - method - POST - - - name - SmartAssistantText_view - - - pt - form_view - - - row_length - 4 - - - stored_encoding - UTF-8 - - - title - Smart Assistant Text - - - unicode_mode - 0 - - - update_action - - - - update_action_title - - - - - - diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/my_text_content.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/my_text_content.xml deleted file mode 100644 index 0d9909c1b2c..00000000000 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/my_text_content.xml +++ /dev/null @@ -1,280 +0,0 @@ - - - - - - - - - - id - my_text_content - - - message_values - - - - external_validator_failed - The input failed the external validator. - - - line_too_long - A line was too long. - - - required_not_found - Input is required but no input given. - - - too_long - You entered too many characters. - - - too_many_lines - You entered too many lines. - - - - - - overrides - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - height - - - - hidden - - - - max_length - - - - max_linelength - - - - max_lines - - - - required - - - - title - - - - unicode - - - - whitespace_preserve - - - - width - - - - - - - tales - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - height - - - - hidden - - - - max_length - - - - max_linelength - - - - max_lines - - - - required - - - - title - - - - unicode - - - - whitespace_preserve - - - - width - - - - - - - values - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - editable - 1 - - - enabled - 1 - - - external_validator - - - - extra - - - - height - 5 - - - hidden - 0 - - - max_length - - - - max_linelength - - - - max_lines - - - - required - 0 - - - title - Text Content - - - unicode - 0 - - - whitespace_preserve - 0 - - - width - 40 - - - - - - - - diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/my_title.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/my_title.xml deleted file mode 100644 index 4cc7d2e889b..00000000000 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/my_title.xml +++ /dev/null @@ -1,272 +0,0 @@ - - - - - - - - - - id - my_title - - - message_values - - - - external_validator_failed - The input failed the external validator. - - - required_not_found - Input is required but no input given. - - - too_long - Too much input was given. - - - - - - overrides - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - display_maxwidth - - - - display_width - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - hidden - - - - input_type - - - - max_length - - - - required - - - - title - - - - truncate - - - - unicode - - - - whitespace_preserve - - - - - - - tales - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - display_maxwidth - - - - display_width - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - hidden - - - - input_type - - - - max_length - - - - required - - - - title - - - - truncate - - - - unicode - - - - whitespace_preserve - - - - - - - values - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - display_maxwidth - - - - display_width - 20 - - - editable - 1 - - - enabled - 1 - - - external_validator - - - - extra - - - - hidden - 0 - - - input_type - text - - - max_length - - - - required - 0 - - - title - Title - - - truncate - 0 - - - unicode - 0 - - - whitespace_preserve - 0 - - - - - - - - diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/your_modification_date.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/your_modification_date.xml deleted file mode 100644 index bafbb7652d6..00000000000 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/your_modification_date.xml +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - - - - id - your_modification_date - - - message_values - - - - external_validator_failed - The input failed the external validator. - - - required_not_found - Input is required but no input given. - - - too_long - Too much input was given. - - - - - - overrides - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - display_maxwidth - - - - display_width - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - hidden - - - - input_type - - - - max_length - - - - required - - - - title - - - - truncate - - - - unicode - - - - whitespace_preserve - - - - - - - tales - - - - alternate_name - - - - css_class - - - - default - - AAAAAAAAAAI= - - - - description - - - - display_maxwidth - - - - display_width - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - hidden - - - - input_type - - - - max_length - - - - required - - - - title - - - - truncate - - - - unicode - - - - whitespace_preserve - - - - - - - values - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - display_maxwidth - - - - display_width - 20 - - - editable - 1 - - - enabled - 1 - - - external_validator - - - - extra - - - - hidden - 0 - - - input_type - text - - - max_length - - - - required - 0 - - - title - Modification Date - - - truncate - 0 - - - unicode - 0 - - - whitespace_preserve - 0 - - - - - - - - - - - - - - - _text - python: here.getModificationDate().rfc822() - - - - - diff --git a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/your_validation_state.xml b/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/your_validation_state.xml deleted file mode 100644 index 395d098ebab..00000000000 --- a/bt5/erp5_smart_assistant/SkinTemplateItem/portal_skins/erp5_smart_assistant_text/SmartAssistantText_viewAsJIO/your_validation_state.xml +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - - - - id - your_validation_state - - - message_values - - - - external_validator_failed - The input failed the external validator. - - - required_not_found - Input is required but no input given. - - - too_long - Too much input was given. - - - - - - overrides - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - display_maxwidth - - - - display_width - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - hidden - - - - input_type - - - - max_length - - - - required - - - - title - - - - truncate - - - - unicode - - - - whitespace_preserve - - - - - - - tales - - - - alternate_name - - - - css_class - - - - default - - AAAAAAAAAAI= - - - - description - - - - display_maxwidth - - - - display_width - - - - editable - - - - enabled - - - - external_validator - - - - extra - - - - hidden - - - - input_type - - - - max_length - - - - required - - - - title - - - - truncate - - - - unicode - - - - whitespace_preserve - - - - - - - values - - - - alternate_name - - - - css_class - - - - default - - - - description - - - - display_maxwidth - - - - display_width - 20 - - - editable - 0 - - - enabled - 1 - - - external_validator - - - - extra - - - - hidden - 0 - - - input_type - text - - - max_length - - - - required - 0 - - - title - Validation State - - - truncate - 0 - - - unicode - 0 - - - whitespace_preserve - 0 - - - - - - - - - - - - - - - _text - python: here.getValidationState() - - - - - -- 2.30.9 From 99f663ef048405505368a43dd44dadede0664c56 Mon Sep 17 00:00:00 2001 From: "lu.xu" Date: Fri, 26 Jul 2019 09:37:55 +0000 Subject: [PATCH 09/10] erp5_officejs: Added "reload()" to home page and added reply to sound module --- ...icejs_erp5_page_smart_assistant_home_js.js | 3 ++ ...cejs_erp5_page_smart_assistant_home_js.xml | 4 +- ...icejs_jio_smart_assistant_sound_view_js.js | 47 +++++++++++++++++-- ...cejs_jio_smart_assistant_sound_view_js.xml | 4 +- 4 files changed, 50 insertions(+), 8 deletions(-) diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_js.js index e098e1f6e21..b1f282d8797 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_js.js @@ -104,6 +104,9 @@ "message": "Data created", "status": "success" }); + }) + .push(function () { + return window.location.reload(); }); } }); diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_js.xml index 9e528704c27..b84300a99bf 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_page_smart_assistant_home_js.xml @@ -227,7 +227,7 @@ serial - 976.54308.37653.52753 + 977.21650.34066.23296 state @@ -245,7 +245,7 @@ - 1562162159.44 + 1564133050.91 UTC diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_sound_view_js.js b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_sound_view_js.js index f6f42d591fd..2d213647644 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_sound_view_js.js +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_sound_view_js.js @@ -11,9 +11,10 @@ .declareAcquiredMethod("getUrlFor", "getUrlFor") .declareAcquiredMethod("updateDocument", "updateDocument") .declareAcquiredMethod("notifySubmitting", "notifySubmitting") - .declareAcquiredMethod("notifySubmitted", 'notifySubmitted') + .declareAcquiredMethod("notifySubmitted", "notifySubmitted") .declareAcquiredMethod("redirect", "redirect") .declareAcquiredMethod("jio_putAttachment", "jio_putAttachment") + .declareAcquiredMethod("jio_get", "jio_get") ///////////////////////////////////////////////////////////////// @@ -28,8 +29,11 @@ gadget.type = options.doc.type; - return RSVP.Queue() - .push(function () { + return gadget.jio_get(options.jio_key) + .push(function (content) { + state.content = content; + state.text = content.text_content; + return RSVP.all([ gadget.getUrlFor({command: 'history_previous'}), gadget.getUrlFor({command: 'selection_previous'}), @@ -76,6 +80,12 @@ }); return queue; }) + .push(function (result1) { + var reply = result1.reply; + return gadget.updateDocument({ + 'text_content': gadget.state.content.text_content + "\n" + reply + }); + }) .push(function () { return gadget.notifySubmitted({ "message": "Data updated", @@ -136,6 +146,29 @@ "accept": "audio/*", "capture": "microphone", "type": "FileField" + }, + "my_text_content": { + "default": gadget.state.content.text_content, + "css_class": "", + "required": 0, + "editable": 0, + "key": "text_content", + "hidden": 0, + "title": 'History', + "type": "TextAreaField" + }, + "my_reply": { + "default": "", + "title": "Reply", + "css_class": "", + "required": 0, + "editable": 1, + "key": "reply", + "hidden": 0, + "renderjs_extra": '{"editor": "fck_editor"}', + "type": "GadgetField", + "url": "gadget_editor.html", + "sandbox": "public" } } }, @@ -149,7 +182,13 @@ form_definition: { group_list: [[ "left", - [["my_title"], ["my_actual_audio"], ["my_audio"]] + [["my_title"], ["my_actual_audio"]] + ], [ + "center", + [["my_text_content"]] + ], [ + "bottom", + [["my_reply"]] ]] } }); diff --git a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_sound_view_js.xml b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_sound_view_js.xml index ddeaa4ec356..1bdbfaa6158 100644 --- a/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_sound_view_js.xml +++ b/bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_smart_assistant_sound_view_js.xml @@ -239,7 +239,7 @@ serial - 966.51362.22678.44731 + 977.20585.17207.5017 state @@ -257,7 +257,7 @@ - 1523439507.26 + 1564070446.12 UTC -- 2.30.9 From 47da500dd54e901d4179cb76460a7ce5de944fa7 Mon Sep 17 00:00:00 2001 From: "lu.xu" Date: Fri, 26 Jul 2019 10:01:24 +0000 Subject: [PATCH 10/10] erp5_smart_assistant: implement workflow to every module --- .../workflow_chain_type.xml | 2 +- .../interactions/text_content.xml | 13 +++++++++---- .../bt/template_portal_type_workflow_chain_list | 2 ++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bt5/erp5_smart_assistant/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_smart_assistant/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml index 3fc08ff2efa..e5fcbaa87ee 100644 --- a/bt5/erp5_smart_assistant/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml +++ b/bt5/erp5_smart_assistant/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml @@ -9,7 +9,7 @@ Smart Assistant Sound - edit_workflow + edit_workflow, smart_assistant_interaction_workflow, smart_assistant_workflow Smart Assistant Text diff --git a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/interactions/text_content.xml b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/interactions/text_content.xml index 4eaa2fcc0b7..2f056de7370 100644 --- a/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/interactions/text_content.xml +++ b/bt5/erp5_smart_assistant/WorkflowTemplateItem/portal_workflow/smart_assistant_interaction_workflow/interactions/text_content.xml @@ -56,18 +56,23 @@ method_id - _setTextContent.* + _set.* once_per_transaction - 0 + 1 portal_type_filter - + + Smart Assistant File + Smart Assistant Image + Smart Assistant Sound + Smart Assistant Text + @@ -84,7 +89,7 @@ temporary_document_disallowed - 1 + 0 title diff --git a/bt5/erp5_smart_assistant/bt/template_portal_type_workflow_chain_list b/bt5/erp5_smart_assistant/bt/template_portal_type_workflow_chain_list index 5f0b9ed610b..243e7d47e6f 100644 --- a/bt5/erp5_smart_assistant/bt/template_portal_type_workflow_chain_list +++ b/bt5/erp5_smart_assistant/bt/template_portal_type_workflow_chain_list @@ -1,6 +1,8 @@ Smart Assistant File | edit_workflow Smart Assistant Image | edit_workflow Smart Assistant Sound | edit_workflow +Smart Assistant Sound | smart_assistant_interaction_workflow +Smart Assistant Sound | smart_assistant_workflow Smart Assistant Text | edit_workflow Smart Assistant Text | smart_assistant_interaction_workflow Smart Assistant Text | smart_assistant_workflow \ No newline at end of file -- 2.30.9