[Erp5-report] r34877 aurel - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: WorkflowTemp...

[nobody at svn.erp5.org]

Author: aurel
Date: Fri Apr 30 11:19:32 2010
New Revision: 34877

URL: http://svn.erp5.org?rev=34877&view=rev
Log:
when automatically disabling preferences, only do with those which has
the same portal type as the original

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/preference_workflow/scripts/disableOtherPreferences.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/preference_workflow/scripts/disableOtherPreferences.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/preference_workflow/scripts/disableOtherPreferences.xml?rev=34877&r1=34876&r2=34877&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/preference_workflow/scripts/disableOtherPreferences.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/preference_workflow/scripts/disableOtherPreferences.xml [utf8] Fri Apr 30 11:19:32 2010
@@ -66,7 +66,8 @@
     if portal.portal_membership.getAuthenticatedMember().allowed(p, [\'Owner\', ]) :\n
       if p != pref and \\\n
          p.getPreferenceState() == \'enabled\' and \\\n
-         p.getPriority() == pref.getPriority() :\n
+         p.getPriority() == pref.getPriority() and \\\n
+         p.getPortalType() == pref.getPortalType() :\n
         p.portal_workflow.doActionFor(p,\n
            \'disable_action\',\n
            wf_id=\'preference_workflow\', \n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=34877&r1=34876&r2=34877&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Fri Apr 30 11:19:32 2010
@@ -1,1 +1,1 @@
-1575
+1577