From 88e776f34a7d602c20cf49e64de80330021dc22f Mon Sep 17 00:00:00 2001 From: Julien Muchembled <jm@nexedi.com> Date: Tue, 24 Feb 2009 16:24:10 +0000 Subject: [PATCH] cf previous commit git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25679 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...tationHelper_getWorkflowPermissionList.xml | 143 ------------- ...ntationHelper_getWorkflowPermissionUrl.xml | 139 ------------- .../workflow_permission_listbox.xml | 22 +- .../workflow_state_listbox.xml | 4 + .../workflow_worklist_listbox.xml | 2 +- ...CWorkflowStateDocumentationHelper_view.xml | 1 + .../my_acquired_permissions.xml} | 70 ++----- ...actionWorkflowDocumentationHelper_view.xml | 2 - .../workflow_worklist_listbox.xml | 191 ------------------ bt5/erp5_documentation/bt/revision | 2 +- 10 files changed, 41 insertions(+), 535 deletions(-) delete mode 100644 bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_getWorkflowPermissionList.xml delete mode 100644 bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_getWorkflowPermissionUrl.xml rename bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/{InteractionWorkflowDocumentationHelper_view/workflow_permission_listbox.xml => DCWorkflowStateDocumentationHelper_view/my_acquired_permissions.xml} (67%) delete mode 100644 bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/InteractionWorkflowDocumentationHelper_view/workflow_worklist_listbox.xml diff --git a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_getWorkflowPermissionList.xml b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_getWorkflowPermissionList.xml deleted file mode 100644 index d03f9c54dd..0000000000 --- a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_getWorkflowPermissionList.xml +++ /dev/null @@ -1,143 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>Script_magic</string> </key> - <value> <int>3</int> </value> - </item> - <item> - <key> <string>_bind_names</string> </key> - <value> - <object> - <klass> - <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_asgns</string> </key> - <value> - <dictionary> - <item> - <key> <string>name_container</string> </key> - <value> <string>container</string> </value> - </item> - <item> - <key> <string>name_context</string> </key> - <value> <string>context</string> </value> - </item> - <item> - <key> <string>name_m_self</string> </key> - <value> <string>script</string> </value> - </item> - <item> - <key> <string>name_subpath</string> </key> - <value> <string>traverse_subpath</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_body</string> </key> - <value> <string>def normalise(s):\n - while s.startswith(\'_\'):\n - s = s[1:]\n - return s\n -\n -def compareId(a, b):\n - return cmp(normalise(a.id), normalise(b.id))\n -state_list = context.getPermissionList()\n -base_uri = context.getURI()\n -result = map(\n - lambda x: context.asContext(id=x, base_uri=base_uri),\n - state_list\n -)\n -result.sort(compareId)\n -return result\n -</string> </value> - </item> - <item> - <key> <string>_code</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_params</string> </key> - <value> <string>**kw</string> </value> - </item> - <item> - <key> <string>errors</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>func_code</string> </key> - <value> - <object> - <klass> - <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>co_argcount</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>co_varnames</string> </key> - <value> - <tuple> - <string>kw</string> - <string>normalise</string> - <string>compareId</string> - <string>_getattr_</string> - <string>context</string> - <string>state_list</string> - <string>base_uri</string> - <string>map</string> - <string>result</string> - </tuple> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>func_defaults</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>DCWorkflowDocumentationHelper_getWorkflowPermissionList</string> </value> - </item> - <item> - <key> <string>warnings</string> </key> - <value> - <tuple/> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_getWorkflowPermissionUrl.xml b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_getWorkflowPermissionUrl.xml deleted file mode 100644 index 795b0f4ecd..0000000000 --- a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_getWorkflowPermissionUrl.xml +++ /dev/null @@ -1,139 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>Script_magic</string> </key> - <value> <int>3</int> </value> - </item> - <item> - <key> <string>_bind_names</string> </key> - <value> - <object> - <klass> - <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_asgns</string> </key> - <value> - <dictionary> - <item> - <key> <string>name_container</string> </key> - <value> <string>container</string> </value> - </item> - <item> - <key> <string>name_context</string> </key> - <value> <string>context</string> </value> - </item> - <item> - <key> <string>name_m_self</string> </key> - <value> <string>script</string> </value> - </item> - <item> - <key> <string>name_subpath</string> </key> - <value> <string>traverse_subpath</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_body</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -portal_url = context.getPortalObject().portal_classes.absolute_url()\n -o = context.getPortalObject().restrictedTraverse(brain.base_uri)\n -uri = brain.base_uri+\'%23\'+brain.id\n -return "%s/DocumentationHelper_viewDocumentationHelper?uri=%s&class_name=DCWorkflowPermissionDocumentationHelper" % \\\n - (portal_url, uri)\n - - -]]></string> </value> - </item> - <item> - <key> <string>_code</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_params</string> </key> - <value> <string>brain=None, selection=None, **kwd</string> </value> - </item> - <item> - <key> <string>errors</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>func_code</string> </key> - <value> - <object> - <klass> - <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>co_argcount</string> </key> - <value> <int>2</int> </value> - </item> - <item> - <key> <string>co_varnames</string> </key> - <value> - <tuple> - <string>brain</string> - <string>selection</string> - <string>kwd</string> - <string>_getattr_</string> - <string>context</string> - <string>portal_url</string> - <string>o</string> - <string>uri</string> - </tuple> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>func_defaults</string> </key> - <value> - <tuple> - <none/> - <none/> - </tuple> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>DCWorkflowDocumentationHelper_getWorkflowPermissionUrl</string> </value> - </item> - <item> - <key> <string>warnings</string> </key> - <value> - <tuple/> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_view/workflow_permission_listbox.xml b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_view/workflow_permission_listbox.xml index 03cb2fdcc4..4f726ee5a7 100644 --- a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_view/workflow_permission_listbox.xml +++ b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_view/workflow_permission_listbox.xml @@ -94,10 +94,6 @@ <key> <string>title</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>url_columns</string> </key> - <value> <string></string> </value> - </item> </dictionary> </value> </item> @@ -110,8 +106,12 @@ <value> <list> <tuple> - <string>id</string> - <string>id</string> + <string>code</string> + <string>Code</string> + </tuple> + <tuple> + <string>permission</string> + <string>Permission</string> </tuple> </list> </value> @@ -151,7 +151,11 @@ <value> <list> <tuple> - <string>id</string> + <string>code</string> + <string></string> + </tuple> + <tuple> + <string>permission</string> <string></string> </tuple> </list> @@ -174,7 +178,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: context.DCWorkflowDocumentationHelper_getWorkflowPermissionList() != []</string> </value> + <value> <string>python: field.get_value(\'list_method\')()</string> </value> </item> </dictionary> </pickle> @@ -190,7 +194,7 @@ <dictionary> <item> <key> <string>method_name</string> </key> - <value> <string>DCWorkflowDocumentationHelper_getWorkflowPermissionList</string> </value> + <value> <string>getPermissionItemList</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_view/workflow_state_listbox.xml b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_view/workflow_state_listbox.xml index 96b1b7d601..75c130d5d1 100644 --- a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_view/workflow_state_listbox.xml +++ b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_view/workflow_state_listbox.xml @@ -121,6 +121,10 @@ <string>getTitle</string> <string>Title</string> </tuple> + <tuple> + <string>getAcquiredPermissions</string> + <string>Acquired</string> + </tuple> </list> </value> </item> diff --git a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_view/workflow_worklist_listbox.xml b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_view/workflow_worklist_listbox.xml index e0e168220b..9563b212f6 100644 --- a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_view/workflow_worklist_listbox.xml +++ b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowDocumentationHelper_view/workflow_worklist_listbox.xml @@ -168,7 +168,7 @@ </tuple> <tuple> <string>role</string> - <string>DCWorkflowDocumentationHelper_getWorkflowTransitionUrl</string> + <string>DCWorkflowDocumentationHelper_getWorkflowWorklistUrl</string> </tuple> </list> </value> diff --git a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowStateDocumentationHelper_view.xml b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowStateDocumentationHelper_view.xml index 84648e8015..dd9cc91d56 100644 --- a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowStateDocumentationHelper_view.xml +++ b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowStateDocumentationHelper_view.xml @@ -100,6 +100,7 @@ <key> <string>right</string> </key> <value> <list> + <string>my_acquired_permissions</string> <string>my_permissions</string> </list> </value> diff --git a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/InteractionWorkflowDocumentationHelper_view/workflow_permission_listbox.xml b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowStateDocumentationHelper_view/my_acquired_permissions.xml similarity index 67% rename from bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/InteractionWorkflowDocumentationHelper_view/workflow_permission_listbox.xml rename to bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowStateDocumentationHelper_view/my_acquired_permissions.xml index ad54dbc193..1199382c51 100644 --- a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/InteractionWorkflowDocumentationHelper_view/workflow_permission_listbox.xml +++ b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DCWorkflowStateDocumentationHelper_view/my_acquired_permissions.xml @@ -14,16 +14,14 @@ <value> <list> <string>title</string> - <string>columns</string> - <string>list_method</string> - <string>selection_name</string> - <string>url_columns</string> + <string>default</string> + <string>editable</string> </list> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>workflow_permission_listbox</string> </value> + <value> <string>my_acquired_permissions</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -60,19 +58,21 @@ <value> <dictionary> <item> - <key> <string>field_id</string> </key> - <value> <string></string> </value> + <key> <string>default</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> </item> <item> - <key> <string>form_id</string> </key> + <key> <string>editable</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>list_method</string> </key> + <key> <string>field_id</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>selection_name</string> </key> + <key> <string>form_id</string> </key> <value> <string></string> </value> </item> <item> @@ -83,10 +83,6 @@ <key> <string>title</string> </key> <value> <string></string> </value> </item> - <item> - <key> <string>url_columns</string> </key> - <value> <string></string> </value> - </item> </dictionary> </value> </item> @@ -95,52 +91,28 @@ <value> <dictionary> <item> - <key> <string>columns</string> </key> - <value> - <list> - <tuple> - <string>id</string> - <string>id</string> - </tuple> - </list> - </value> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <int>0</int> </value> </item> <item> <key> <string>field_id</string> </key> - <value> <string>my_view_mode_listbox</string> </value> + <value> <string>my_string_field</string> </value> </item> <item> <key> <string>form_id</string> </key> <value> <string>Base_viewFieldLibrary</string> </value> </item> - <item> - <key> <string>list_method</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>selection_name</string> </key> - <value> <string>workflow_permission_selection</string> </value> - </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> </item> <item> <key> <string>title</string> </key> - <value> <string>Workflow Permissions</string> </value> - </item> - <item> - <key> <string>url_columns</string> </key> - <value> - <list> - <tuple> - <string>id</string> - <string></string> - </tuple> - </list> - </value> + <value> <string>Acquired</string> </value> </item> </dictionary> </value> @@ -151,15 +123,15 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <global name="Method" module="Products.Formulator.MethodField"/> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> <tuple/> </tuple> </pickle> <pickle> <dictionary> <item> - <key> <string>method_name</string> </key> - <value> <string>DCWorkflowDocumentationHelper_getWorkflowPermissionList</string> </value> + <key> <string>_text</string> </key> + <value> <string>here/getAcquiredPermissions</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/InteractionWorkflowDocumentationHelper_view.xml b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/InteractionWorkflowDocumentationHelper_view.xml index 6cb7279282..a44b637e52 100644 --- a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/InteractionWorkflowDocumentationHelper_view.xml +++ b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/InteractionWorkflowDocumentationHelper_view.xml @@ -69,9 +69,7 @@ <value> <list> <string>workflow_variable_listbox</string> - <string>workflow_worklist_listbox</string> <string>workflow_script_listbox</string> - <string>workflow_permission_listbox</string> </list> </value> </item> diff --git a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/InteractionWorkflowDocumentationHelper_view/workflow_worklist_listbox.xml b/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/InteractionWorkflowDocumentationHelper_view/workflow_worklist_listbox.xml deleted file mode 100644 index 2781e43536..0000000000 --- a/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/InteractionWorkflowDocumentationHelper_view/workflow_worklist_listbox.xml +++ /dev/null @@ -1,191 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>delegated_list</string> </key> - <value> - <list> - <string>title</string> - <string>columns</string> - <string>list_method</string> - <string>selection_name</string> - <string>url_columns</string> - </list> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>workflow_worklist_listbox</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>field_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>tales</string> </key> - <value> - <dictionary> - <item> - <key> <string>field_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>list_method</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>selection_name</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>url_columns</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>values</string> </key> - <value> - <dictionary> - <item> - <key> <string>columns</string> </key> - <value> - <list> - <tuple> - <string>id</string> - <string>Id</string> - </tuple> - <tuple> - <string>title</string> - <string>Title</string> - </tuple> - <tuple> - <string>description</string> - <string>Description</string> - </tuple> - <tuple> - <string>role</string> - <string>Role(s)</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>field_id</string> </key> - <value> <string>my_view_mode_listbox</string> </value> - </item> - <item> - <key> <string>form_id</string> </key> - <value> <string>Base_viewFieldLibrary</string> </value> - </item> - <item> - <key> <string>list_method</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>selection_name</string> </key> - <value> <string>workflow_worklist_selection</string> </value> - </item> - <item> - <key> <string>target</string> </key> - <value> <string>Click to edit the target</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Workflow Worklists</string> </value> - </item> - <item> - <key> <string>url_columns</string> </key> - <value> - <list> - <tuple> - <string>id</string> - <string>DCWorkflowDocumentationHelper_getWorkflowWorklistUrl</string> - </tuple> - <tuple> - <string>title</string> - <string>DCWorkflowDocumentationHelper_getWorkflowWorklistUrl</string> - </tuple> - <tuple> - <string>description</string> - <string>DCWorkflowDocumentationHelper_getWorkflowWorklistUrl</string> - </tuple> - <tuple> - <string>role</string> - <string>DCWorkflowDocumentationHelper_getWorkflowTransitionUrl</string> - </tuple> - </list> - </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <global name="Method" module="Products.Formulator.MethodField"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>method_name</string> </key> - <value> <string>DCWorkflowDocumentationHelper_getWorkflowWorklistList</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_documentation/bt/revision b/bt5/erp5_documentation/bt/revision index 9a1371776c..3968aef87f 100644 --- a/bt5/erp5_documentation/bt/revision +++ b/bt5/erp5_documentation/bt/revision @@ -1 +1 @@ -169 \ No newline at end of file +170 \ No newline at end of file -- 2.30.9