[Erp5-report] r19286 - /erp5/trunk/products/ERP5Catalog/CatalogTool.py

[nobody at svn.erp5.org]

Author: vincent
Date: Tue Feb 12 18:16:10 2008
New Revision: 19286

URL: http://svn.erp5.org?rev=19286&view=rev
Log:
Remove Owner key before iterating on the dictionary to avoid testing at each iterration.

Modified:
    erp5/trunk/products/ERP5Catalog/CatalogTool.py

Modified: erp5/trunk/products/ERP5Catalog/CatalogTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Catalog/CatalogTool.py?rev=19286&r1=19285&r2=19286&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/CatalogTool.py (original)
+++ erp5/trunk/products/ERP5Catalog/CatalogTool.py Tue Feb 12 18:16:10 2008
@@ -146,6 +146,8 @@
             new_dict[key] = new_list
         localroles = new_dict
         user_role_list = []
+        if 'Owner' in localroles:
+          del localroles['Owner']
         for role_list in localroles.values():
           user_role_list.extend([role for role in role_list if role not in user_role_list])
         # Added for ERP5 project by JP Smets
@@ -159,8 +161,6 @@
         view_role_list = [role for role in user_role_list if allowed.has_key(role)]
         for user, roles in localroles.items():
           for role in roles:
-            if role == 'Owner':
-              continue
             if allowed.has_key(role):
               if withnuxgroups:
                 allowed[user] = 1