[Erp5-report] r21379 - in /erp5/trunk/bt5/erp5_crm: SkinTemplateItem/portal_skins/erp5_crm/...

[nobody at svn.erp5.org]

Author: yusei
Date: Fri Jun  6 13:47:38 2008
New Revision: 21379

URL: http://svn.erp5.org?rev=21379&view=rev
Log:
2008-06-06 yusei
* In Event_send, invoke transition only when portal type is available (it means crm portal types are installed).

Modified:
    erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_send.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_send.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_send.xml?rev=21379&r1=21378&r2=21379&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_send.xml (original)
+++ erp5/trunk/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_send.xml Fri Jun  6 13:47:38 2008
@@ -67,12 +67,6 @@
             <key> <string>_body</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-# Transit event workflow\n
-if \'event_workflow\' in context.portal_workflow.getWorkflowsFor(context):\n
-  context.plan()\n
-  context.order()\n
-  context.start()\n
-\n
 if body is None:\n
   body = context.getTextContent() #XXX This does not support structured text format.\n
 \n
@@ -144,6 +138,12 @@
   context.activate(activity=\'SQLQueue\').sendMailHostMessage(mail_message)\n
 \n
 context.setData(mail_message)\n
+\n
+# Transit event workflow\n
+if context.getTypeInfo() is not None:\n
+  context.plan()\n
+  context.order()\n
+  context.start()\n
 \n
 if download:\n
   return mail_message\n
@@ -206,9 +206,9 @@
                             <string>attachment_list</string>
                             <string>download</string>
                             <string>kw</string>
+                            <string>None</string>
                             <string>_getattr_</string>
                             <string>context</string>
-                            <string>None</string>
                             <string>sender</string>
                             <string>additional_headers</string>
                             <string>to_url_list</string>

Modified: erp5/trunk/bt5/erp5_crm/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/bt/change_log?rev=21379&r1=21378&r2=21379&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_crm/bt/change_log Fri Jun  6 13:47:38 2008
@@ -1,3 +1,6 @@
+2008-06-06 yusei
+* In Event_send, invoke transition only when portal type is available (it means crm portal types are installed).
+
 2008-06-04
 * Add rights for manager in :
 sale_opportunity_workflow  :  Contacted, Cancelled

Modified: erp5/trunk/bt5/erp5_crm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/bt/revision?rev=21379&r1=21378&r2=21379&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/bt/revision (original)
+++ erp5/trunk/bt5/erp5_crm/bt/revision Fri Jun  6 13:47:38 2008
@@ -1,1 +1,1 @@
-258
+259