From 8f54a48bb6dcd3088091abc703cf80e85acf5459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com> Date: Mon, 14 Jan 2008 15:22:48 +0000 Subject: [PATCH] on assignment, start_date is default to now when closing assignment, set stop date if not in the past git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18692 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../Assignment_view/my_start_date.xml | 8 +- .../scripts/Assignment_setStopDate.xml | 153 ++++++++++++++++++ .../transitions/close_action.xml | 16 +- bt5/erp5_base/bt/revision | 2 +- 4 files changed, 166 insertions(+), 13 deletions(-) create mode 100644 bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_setStopDate.xml diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_start_date.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_start_date.xml index 03d2f1609c..c92fe989d5 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_start_date.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Assignment_view/my_start_date.xml @@ -12,7 +12,9 @@ <item> <key> <string>delegated_list</string> </key> <value> - <list/> + <list> + <string>default_now</string> + </list> </value> </item> <item> @@ -72,6 +74,10 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>default_now</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>field_id</string> </key> <value> <string>my_start_date</string> </value> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_setStopDate.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_setStopDate.xml new file mode 100644 index 0000000000..5b49b77268 --- /dev/null +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/scripts/Assignment_setStopDate.xml @@ -0,0 +1,153 @@ +<?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>Python_magic</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>Script_magic</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </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[ + +assignment = state_change[\'object\']\n +from DateTime import DateTime\n +current_date = DateTime()\n +if assignment.getStopDate() is None or assignment.getStopDate() > current_date:\n + assignment.setStopDate(current_date)\n + + +]]></string> </value> + </item> + <item> + <key> <string>_code</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_filepath</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string>state_change</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>1</int> </value> + </item> + <item> + <key> <string>co_varnames</string> </key> + <value> + <tuple> + <string>state_change</string> + <string>_getitem_</string> + <string>assignment</string> + <string>DateTime</string> + <string>current_date</string> + <string>_getattr_</string> + <string>None</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>Assignment_setStopDate</string> </value> + </item> + <item> + <key> <string>warnings</string> </key> + <value> + <tuple/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/close_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/close_action.xml index 9b56587769..52c3b40db0 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/close_action.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/transitions/close_action.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Transitions</string> - <string>TransitionDefinition</string> - </tuple> - <none/> + <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/> + <tuple/> </tuple> </pickle> <pickle> @@ -54,7 +51,7 @@ </item> <item> <key> <string>script_name</string> </key> - <value> <string></string> </value> + <value> <string>Assignment_setStopDate</string> </value> </item> <item> <key> <string>title</string> </key> @@ -70,11 +67,8 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.DCWorkflow.Guard</string> - <string>Guard</string> - </tuple> - <none/> + <global name="Guard" module="Products.DCWorkflow.Guard"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index 44dfb1d0bc..4acc65d012 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -264 \ No newline at end of file +266 \ No newline at end of file -- 2.30.9