[Erp5-report] r26490 - in /erp5/trunk/bt5/erp5_project: WorkflowTemplateItem/portal_workflo...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Apr 17 19:56:02 2009
New Revision: 26490

URL: http://svn.erp5.org?rev=26490&view=rev
Log:
* Fix more problems with the use of portal_membership

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/scripts/TaskReport_notifyRestartToAssignee.xml
    erp5/trunk/bt5/erp5_project/bt/revision

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=26490&r1=26489&r2=26490&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyAssignee.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyAssignee.xml [utf8] Fri Apr 17 19:56:02 2009
@@ -82,8 +82,7 @@
       and destination_decision_person is not None\\\n
       and source_person.getDefaultEmailText() \\\n
       and source_person.getReference():\n
-  source_user = portal.portal_membership.getMemberById(source_person.getReference())\n
-  if source_user is not None:\n
+  if len(portal.acl_users.erp5_users.getUserByLogin(source_person.getReference())):\n
     message = """\n
 A question from task has been assigned to you by %(assignor)s.\n
 \n
@@ -172,7 +171,6 @@
                             <string>source_person</string>
                             <string>destination_decision_person</string>
                             <string>None</string>
-                            <string>source_user</string>
                             <string>message</string>
                           </tuple>
                         </value>

Modified: 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=26490&r1=26489&r2=26490&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyRestartToAssignee.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/scripts/TaskReport_notifyRestartToAssignee.xml [utf8] Fri Apr 17 19:56:02 2009
@@ -68,8 +68,7 @@
       and destination_decision_person is not None\\\n
       and source_person.getDefaultEmailText() \\\n
       and source_person.getReference():\n
-  source_user = portal.portal_membership.getMemberById(source_person.getReference())\n
-  if source_user is not None:\n
+  if len(portal.acl_users.erp5_users.getUserByLogin(source_person.getReference())):\n
     message = """\n
 Restarted task has been assigned to you by %(assignor)s.\n
 \n
@@ -145,7 +144,7 @@
                             <string>source_person</string>
                             <string>destination_decision_person</string>
                             <string>None</string>
-                            <string>source_user</string>
+                            <string>len</string>
                             <string>message</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_project/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/bt/revision?rev=26490&r1=26489&r2=26490&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/bt/revision [utf8] Fri Apr 17 19:56:02 2009
@@ -1,1 +1,1 @@
-632
+633