[Erp5-report] r21063 - in /erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed May 21 17:35:24 CEST 2008
Author: rafael
Date: Wed May 21 17:35:12 2008
New Revision: 21063
URL: http://svn.erp5.org?rev=21063&view=rev
Log:
improve notification messages.
Added:
erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyRestartToAssignee.xml
Modified:
erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyAssignee.xml
erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/restart.xml
erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/restart_action.xml
Modified: erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyAssignee.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyAssignee.xml?rev=21063&r1=21062&r2=21063&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyAssignee.xml (original)
+++ erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyAssignee.xml Wed May 21 17:35:12 2008
@@ -65,19 +65,35 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>packing_list = state_change[\'object\']\n
+ <value> <string encoding="cdata"><![CDATA[
+
+packing_list = state_change[\'object\']\n
+\n
+# get question\n
+history = context.portal_workflow.getInfoFor(ob=packing_list,\n
+ name=\'history\',\n
+ wf_id=\'task_report_workflow\',\n
+ default=())\n
+\n
+question_list = [question for question in history if question[\'action\'] == \'question_action\' ]\n
+if len(question_list) > 0:\n
+ question = last_question[-1][\'comment\']\n
+else:\n
+ question = \'\'\n
+\n
+\n
\n
# Notify assignee\n
-source_person = context.getSourceValue(portal_type="Person")\n
-destination_decision_person = context.getDestinationDecisionValue(portal_type="Person")\n
+source_person = packing_list.getSourceValue(portal_type="Person")\n
+destination_decision_person = packing_list.getDestinationDecisionValue(portal_type="Person")\n
if destination_decision_person is None:\n
- destination_decision_person = context.getDestinationValue(portal_type="Person")\n
+ destination_decision_person = packing_list.getDestinationValue(portal_type="Person")\n
if source_person is not None:\n
from_email = destination_decision_person.getDefaultEmailText()\n
email = source_person.getDefaultEmailValue()\n
if email is not None:\n
msg = """\n
-A new task has been assigned to you by %(assignor)s.\n
+A question from task has been assigned to you by %(assignor)s.\n
\n
This task is named: %(title)s\n
\n
@@ -86,6 +102,9 @@
\n
Start Date: %(start_date)s\n
Stop Date: %(stop_date)s\n
+\n
+Question:\n
+%(question)s\n
\n
Please visit ERP5: %(url)s\n
""" % {\n
@@ -96,9 +115,12 @@
\'comment\' : packing_list.getComment(),\n
\'start_date\': packing_list.getStartDate().Date(),\n
\'stop_date\': packing_list.getStopDate().Date(),\n
+ \'question\' : question,\n
}\n
- email.activate().send(from_url = from_email, subject="New Task Assigned to You", msg = msg)\n
-</string> </value>
+ email.activate().send(from_url = from_email, subject=" Task Assigned to You", msg = msg)\n
+
+
+]]></string> </value>
</item>
<item>
<key> <string>_code</string> </key>
@@ -145,6 +167,14 @@
<string>packing_list</string>
<string>_getattr_</string>
<string>context</string>
+ <string>history</string>
+ <string>append</string>
+ <string>$append0</string>
+ <string>_getiter_</string>
+ <string>question</string>
+ <string>question_list</string>
+ <string>len</string>
+ <string>last_question</string>
<string>source_person</string>
<string>destination_decision_person</string>
<string>None</string>
Added: erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyRestartToAssignee.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyRestartToAssignee.xml?rev=21063&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyRestartToAssignee.xml (added)
+++ erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyRestartToAssignee.xml Wed May 21 17:35:12 2008
@@ -1,0 +1,180 @@
+<?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>packing_list = state_change[\'object\']\n
+\n
+# Notify assignee\n
+source_person = packing_list.getSourceValue(portal_type="Person")\n
+destination_decision_person = packing_list.getDestinationDecisionValue(portal_type="Person")\n
+if destination_decision_person is None:\n
+ destination_decision_person = packing_list.getDestinationValue(portal_type="Person")\n
+if source_person is not None:\n
+ from_email = destination_decision_person.getDefaultEmailText()\n
+ email = source_person.getDefaultEmailValue()\n
+ if email is not None:\n
+ msg = """\n
+Restarted task has been assigned to you by %(assignor)s.\n
+\n
+This task is named: %(title)s\n
+\n
+Description: \n
+%(comment)s\n
+\n
+Start Date: %(start_date)s\n
+Stop Date: %(stop_date)s\n
+\n
+Please visit ERP5: %(url)s\n
+""" % {\n
+ \'assignor\': destination_decision_person.getTitle(),\n
+ \'title\' : packing_list.getTitle(),\n
+ \'url\' : \'%s/%s\' % (packing_list.ERP5Site_getAbsoluteUrl(),\n
+ packing_list.getRelativeUrl()),\n
+ \'comment\' : packing_list.getComment(),\n
+ \'start_date\': packing_list.getStartDate().Date(),\n
+ \'stop_date\': packing_list.getStopDate().Date(),\n
+ }\n
+ email.activate().send(from_url = from_email, subject="Restarted Task Assigned to You", msg = msg)\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>packing_list</string>
+ <string>_getattr_</string>
+ <string>source_person</string>
+ <string>destination_decision_person</string>
+ <string>None</string>
+ <string>from_email</string>
+ <string>email</string>
+ <string>msg</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>TaskReport_notifyRestartToAssignee</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/restart.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/restart.xml?rev=21063&r1=21062&r2=21063&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/restart.xml (original)
+++ erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/restart.xml Wed May 21 17:35:12 2008
@@ -35,7 +35,7 @@
</item>
<item>
<key> <string>after_script_name</string> </key>
- <value> <string>TaskReport_notifyAssignee</string> </value>
+ <value> <string>TaskReport_notifyRestartToAssignee</string> </value>
</item>
<item>
<key> <string>description</string> </key>
Modified: erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/restart_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/restart_action.xml?rev=21063&r1=21062&r2=21063&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/restart_action.xml (original)
+++ erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/transitions/restart_action.xml Wed May 21 17:35:12 2008
@@ -83,7 +83,6 @@
<key> <string>roles</string> </key>
<value>
<tuple>
- <string>Assignee</string>
<string>Assignor</string>
</tuple>
</value>
More information about the Erp5-report
mailing list