Skip to content

erp5
erp5
Commit 7e5c1a2a authored by iv's avatar iv
Browse files
Options

ERP5Workflow: changes on Interaction/Worklist/Transition view 

- change guard-related description to be more clear and consistent
- remove expression from Transition view
- show right guard properties (were renamed)
parent fcaf8c5e
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 123 deletions
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Interaction_view.xml
View file @ 7e5c1a2a
...@@ -94,10 +94,10 @@ ...@@ -94,10 +94,10 @@
<key> <string>right</string> </key> <key> <string>right</string> </key>
<value> <value>
<list> <list>
<string>my_permission_list</string> <string>my_guard_permission_list</string>
<string>my_role_list</string> <string>my_guard_role_list</string>
<string>my_group_list</string> <string>my_guard_group_list</string>
<string>my_expression</string> <string>my_guard_expression</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Interaction_view/my_expression.xml → bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Interaction_view/my_guard_expression.xml
View file @ 7e5c1a2a
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_expression</string> </value> <value> <string>my_guard_expression</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Expression</string> </value> <value> <string>Guard Expression</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Interaction_view/my_group_list.xml → bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Interaction_view/my_guard_group_list.xml
View file @ 7e5c1a2a
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_group_list</string> </value> <value> <string>my_guard_group_list</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Required Group</string> </value> <value> <string>Guard Group</string> </value>
</item> </item>
<item> <item>
<key> <string>unicode</string> </key> <key> <string>unicode</string> </key>
...@@ -277,8 +277,7 @@ ...@@ -277,8 +277,7 @@
<key> <string>view_separator</string> </key> <key> <string>view_separator</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<br />\n <br />
]]></string> </value> ]]></string> </value>
</item> </item>
......
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Interaction_view/my_permission_list.xml → bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Interaction_view/my_guard_permission_list.xml
View file @ 7e5c1a2a
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_permission_list</string> </value> <value> <string>my_guard_permission_list</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Required Permission</string> </value> <value> <string>Guard Permission</string> </value>
</item> </item>
<item> <item>
<key> <string>unicode</string> </key> <key> <string>unicode</string> </key>
...@@ -277,8 +277,7 @@ ...@@ -277,8 +277,7 @@
<key> <string>view_separator</string> </key> <key> <string>view_separator</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<br />\n <br />
]]></string> </value> ]]></string> </value>
</item> </item>
......
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Interaction_view/my_role_list.xml → bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Interaction_view/my_guard_role_list.xml
View file @ 7e5c1a2a
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_role_list</string> </value> <value> <string>my_guard_role_list</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Required Role (s)</string> </value> <value> <string>Guard Role(s)</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Transition_view.xml
View file @ 7e5c1a2a
...@@ -91,7 +91,6 @@ ...@@ -91,7 +91,6 @@
<string>my_reference</string> <string>my_reference</string>
<string>my_title</string> <string>my_title</string>
<string>my_destination_title</string> <string>my_destination_title</string>
<string>my_expression</string>
<string>my_actbox_name</string> <string>my_actbox_name</string>
<string>my_actbox_url</string> <string>my_actbox_url</string>
<string>my_actbox_icon</string> <string>my_actbox_icon</string>
......
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Transition_view/my_expression.xml deleted 100644 → 0
View file @ fcaf8c5e
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_expression</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>extra_context</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>extra_context</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>extra_context</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_title</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>BaseWorkflow_FieldLibrary</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Expression</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Worklist_view/my_guard_expression.xml
View file @ 7e5c1a2a
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Expression</string> </value> <value> <string>Guard Expression</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Worklist_view/my_guard_group_list.xml
View file @ 7e5c1a2a
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Required Group</string> </value> <value> <string>Guard Group</string> </value>
</item> </item>
<item> <item>
<key> <string>unicode</string> </key> <key> <string>unicode</string> </key>
...@@ -277,8 +277,7 @@ ...@@ -277,8 +277,7 @@
<key> <string>view_separator</string> </key> <key> <string>view_separator</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<br />\n <br />
]]></string> </value> ]]></string> </value>
</item> </item>
......
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Worklist_view/my_guard_permission_list.xml
View file @ 7e5c1a2a
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Required Permission</string> </value> <value> <string>Guard Permission</string> </value>
</item> </item>
<item> <item>
<key> <string>unicode</string> </key> <key> <string>unicode</string> </key>
...@@ -277,8 +277,7 @@ ...@@ -277,8 +277,7 @@
<key> <string>view_separator</string> </key> <key> <string>view_separator</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<br />\n <br />
]]></string> </value> ]]></string> </value>
</item> </item>
......
bt5/erp5_workflow/SkinTemplateItem/portal_skins/erp5_workflow/Worklist_view/my_guard_role_list.xml
View file @ 7e5c1a2a
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Required Role (s)</string> </value> <value> <string>Guard Role(s)</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7