[Erp5-report] r21216 - in /erp5/trunk/bt5/erp5_crm: SkinTemplateItem/portal_skins/erp5_crm/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu May 29 11:42:43 CEST 2008
Author: yusei
Date: Thu May 29 11:42:40 2008
New Revision: 21216
URL: http://svn.erp5.org?rev=21216&view=rev
Log:
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.
Added:
erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAcknowledgeActionDialog/your_quote_original_message.xml
erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/variables/quote_original_message.xml
Modified:
erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAcknowledgeActionDialog.xml
erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_createEventForAcknowledge.xml
erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/acknowledge_action.xml
erp5/trunk/bt5/erp5_crm/bt/change_log
erp5/trunk/bt5/erp5_crm/bt/revision
Modified: erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAcknowledgeActionDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAcknowledgeActionDialog.xml?rev=21216&r1=21215&r2=21216&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAcknowledgeActionDialog.xml (original)
+++ erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAcknowledgeActionDialog.xml Thu May 29 11:42:40 2008
@@ -83,8 +83,9 @@
<string>your_follow_up_ticket_title</string>
<string>your_follow_up_ticket_type</string>
<string>your_comment</string>
+ <string>your_create_event</string>
+ <string>your_quote_original_message</string>
<string>your_workflow_action</string>
- <string>your_create_event</string>
</list>
</value>
</item>
Added: erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAcknowledgeActionDialog/your_quote_original_message.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAcknowledgeActionDialog/your_quote_original_message.xml?rev=21216&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAcknowledgeActionDialog/your_quote_original_message.xml (added)
+++ erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAcknowledgeActionDialog/your_quote_original_message.xml Thu May 29 11:42:40 2008
@@ -1,0 +1,171 @@
+<?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>
Modified: erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_createEventForAcknowledge.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_createEventForAcknowledge.xml?rev=21216&r1=21215&r2=21216&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_createEventForAcknowledge.xml (original)
+++ erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_createEventForAcknowledge.xml Thu May 29 11:42:40 2008
@@ -80,8 +80,12 @@
\'follow_up_ticket_title\',\n
wf_id=\'event_workflow\')\n
\n
-create_event = portal.portal_workflow.getInfoFor(event, \'create_event\',\n
- wf_id=\'event_workflow\')\n
+create_event = portal_workflow.getInfoFor(event, \'create_event\',\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
follow_up = event.getFollowUp()\n
\n
@@ -94,11 +98,15 @@
follow_up_ticket_type)\n
\n
if create_event:\n
- portal.event_module.newContent(portal_type=event.portal_type,\n
- destination=event.getSource(),\n
- follow_up=event.getFollowUp(),\n
- causality=event.getRelativeUrl(),\n
- start_date=DateTime())\n
+ new_event = portal.event_module.newContent(portal_type=event.portal_type,\n
+ destination=event.getSource(),\n
+ follow_up=event.getFollowUp(),\n
+ causality=event.getRelativeUrl(),\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>
</item>
<item>
@@ -150,10 +158,12 @@
<string>follow_up_ticket_type</string>
<string>follow_up_ticket_title</string>
<string>create_event</string>
+ <string>quote_original_message</string>
<string>follow_up</string>
<string>None</string>
<string>ValueError</string>
<string>DateTime</string>
+ <string>new_event</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/acknowledge_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/acknowledge_action.xml?rev=21216&r1=21215&r2=21216&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/acknowledge_action.xml (original)
+++ erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/transitions/acknowledge_action.xml Thu May 29 11:42:40 2008
@@ -122,6 +122,12 @@
<persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
</value>
</item>
+ <item>
+ <key> <string>quote_original_message</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
+ </value>
+ </item>
</dictionary>
</value>
</item>
@@ -176,4 +182,20 @@
</dictionary>
</pickle>
</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>
Added: erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/variables/quote_original_message.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/variables/quote_original_message.xml?rev=21216&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/variables/quote_original_message.xml (added)
+++ erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/variables/quote_original_message.xml Thu May 29 11:42:40 2008
@@ -1,0 +1,57 @@
+<?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>
Modified: erp5/trunk/bt5/erp5_crm/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/bt/change_log?rev=21216&r1=21215&r2=21216&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_crm/bt/change_log Thu May 29 11:42:40 2008
@@ -1,5 +1,6 @@
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.
2008-5-27 yusei
* Replace "Create Related Event" action with a equivalent workflow method.
Modified: erp5/trunk/bt5/erp5_crm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/bt/revision?rev=21216&r1=21215&r2=21216&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/bt/revision (original)
+++ erp5/trunk/bt5/erp5_crm/bt/revision Thu May 29 11:42:40 2008
@@ -1,1 +1,1 @@
-249
+250
More information about the Erp5-report
mailing list