Commit e24695e4 authored by Yusei Tahara's avatar Yusei Tahara

2008-5-29 yusei

* Modifiy response transition in event_workflow, now it create a new event and send it to recepient immediately.
* Add quotation option in acknowledge dialog.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@21216 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 9a372563
...@@ -83,8 +83,9 @@ ...@@ -83,8 +83,9 @@
<string>your_follow_up_ticket_title</string> <string>your_follow_up_ticket_title</string>
<string>your_follow_up_ticket_type</string> <string>your_follow_up_ticket_type</string>
<string>your_comment</string> <string>your_comment</string>
<string>your_workflow_action</string>
<string>your_create_event</string> <string>your_create_event</string>
<string>your_quote_original_message</string>
<string>your_workflow_action</string>
</list> </list>
</value> </value>
</item> </item>
......
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>your_quote_original_message</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>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Quote Original Message</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
...@@ -80,8 +80,12 @@ follow_up_ticket_title = portal_workflow.getInfoFor(event,\n ...@@ -80,8 +80,12 @@ follow_up_ticket_title = portal_workflow.getInfoFor(event,\n
\'follow_up_ticket_title\',\n \'follow_up_ticket_title\',\n
wf_id=\'event_workflow\')\n wf_id=\'event_workflow\')\n
\n \n
create_event = portal.portal_workflow.getInfoFor(event, \'create_event\',\n create_event = portal_workflow.getInfoFor(event, \'create_event\',\n
wf_id=\'event_workflow\')\n wf_id=\'event_workflow\')\n
\n
quote_original_message = portal_workflow.getInfoFor(event,\n
\'quote_original_message\',\n
wf_id=\'event_workflow\')\n
\n \n
follow_up = event.getFollowUp()\n follow_up = event.getFollowUp()\n
\n \n
...@@ -94,11 +98,15 @@ if follow_up is None and follow_up_ticket_type and follow_up_ticket_title:\n ...@@ -94,11 +98,15 @@ if follow_up is None and follow_up_ticket_type and follow_up_ticket_title:\n
follow_up_ticket_type)\n follow_up_ticket_type)\n
\n \n
if create_event:\n if create_event:\n
portal.event_module.newContent(portal_type=event.portal_type,\n new_event = portal.event_module.newContent(portal_type=event.portal_type,\n
destination=event.getSource(),\n destination=event.getSource(),\n
follow_up=event.getFollowUp(),\n follow_up=event.getFollowUp(),\n
causality=event.getRelativeUrl(),\n causality=event.getRelativeUrl(),\n
start_date=DateTime())\n start_date=DateTime())\n
\n
if quote_original_message:\n
new_event.edit(text_format=event.getTextFormat(),\n
text_content=event.getReplyBody())\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -150,10 +158,12 @@ if create_event:\n ...@@ -150,10 +158,12 @@ if create_event:\n
<string>follow_up_ticket_type</string> <string>follow_up_ticket_type</string>
<string>follow_up_ticket_title</string> <string>follow_up_ticket_title</string>
<string>create_event</string> <string>create_event</string>
<string>quote_original_message</string>
<string>follow_up</string> <string>follow_up</string>
<string>None</string> <string>None</string>
<string>ValueError</string> <string>ValueError</string>
<string>DateTime</string> <string>DateTime</string>
<string>new_event</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -122,6 +122,12 @@ ...@@ -122,6 +122,12 @@
<persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>quote_original_message</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -176,4 +182,20 @@ ...@@ -176,4 +182,20 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="7" aka="AAAAAAAAAAc=">
<pickle>
<tuple>
<global name="Expression" module="Products.CMFCore.Expression"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>python:state_change.kwargs.get(\'create_event\') and state_change.kwargs.get(\'quote_original_message\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>default_expr</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>default_value</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>for_catalog</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>for_status</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>quote_original_message</string> </value>
</item>
<item>
<key> <string>info_guard</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>update_always</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
2008-5-29 yusei 2008-5-29 yusei
* Modifiy response transition in event_workflow, now it create a new event and send it to recepient immediately. * Modifiy response transition in event_workflow, now it create a new event and send it to recepient immediately.
* Add quotation option in acknowledge dialog.
2008-5-27 yusei 2008-5-27 yusei
* Replace "Create Related Event" action with a equivalent workflow method. * Replace "Create Related Event" action with a equivalent workflow method.
......
249 250
\ No newline at end of file \ No newline at end of file
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