[Erp5-report] r28995 - in /erp5/trunk/bt5/erp5_crm: WorkflowTemplateItem/portal_workflow/ev...

[nobody at svn.erp5.org]

Author: rafael
Date: Fri Sep 11 23:00:18 2009
New Revision: 28995

URL: http://svn.erp5.org?rev=28995&view=rev
Log:
If follow up information comes with the dialog, it is not needed to check the follow up because it will be created later.

Modified:
    erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_checkConsistencyForAcknowledge.xml
    erp5/trunk/bt5/erp5_crm/bt/revision

Modified: erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_checkConsistencyForAcknowledge.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_checkConsistencyForAcknowledge.xml?rev=28995&r1=28994&r2=28995&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_checkConsistencyForAcknowledge.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/scripts/Event_checkConsistencyForAcknowledge.xml [utf8] Fri Sep 11 23:00:18 2009
@@ -58,7 +58,22 @@
 \n
 container.Event_checkConsistency(sci)\n
 \n
+portal = sci.getPortal()\n
+portal_workflow = portal.portal_workflow\n
 event = sci[\'object\']\n
+\n
+follow_up_ticket_type = portal_workflow.getInfoFor(event,\n
+                                                   \'follow_up_ticket_type\',\n
+                                                   wf_id=\'event_workflow\')\n
+\n
+follow_up_ticket_title = portal_workflow.getInfoFor(event,\n
+                                                    \'follow_up_ticket_title\',\n
+                                                    wf_id=\'event_workflow\')\n
+\n
+if follow_up_ticket_type not in ["", None] and \\\n
+     follow_up_ticket_title not in ["", None]:\n
+  return \n
+\n
 if not event.getFollowUp():\n
   raise ValidationFailed(translateString(\'Follow up must be set to acknowledge an Event.\'))\n
 </string> </value>
@@ -104,8 +119,13 @@
                             <string>translateString</string>
                             <string>_getattr_</string>
                             <string>container</string>
+                            <string>portal</string>
+                            <string>portal_workflow</string>
                             <string>_getitem_</string>
                             <string>event</string>
+                            <string>follow_up_ticket_type</string>
+                            <string>follow_up_ticket_title</string>
+                            <string>None</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_crm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_crm/bt/revision?rev=28995&r1=28994&r2=28995&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_crm/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_crm/bt/revision [utf8] Fri Sep 11 23:00:18 2009
@@ -1,1 +1,1 @@
-436
+437