Commit: e920bc6da262b6b0f4323be09581f2958b4c593a - allura (git)

allura

Commit MetaInfo

• Revision: e920bc6da262b6b0f4323be09581f2958b4c593a (tree)
• Zeit: 2012-07-13 05:08:29
• Autor: Cory Johns <johnsca@geek...>
• Commiter: Cory Johns

Log Message

[#3892] Moved ACL.add method as ACL instances are not of the ACL class

Signed-off-by: Cory Johns <[e-mail]>

Ändern Zusammenfassung

• modified: Allura/allura/model/types.py
• modified: scripts/migrations/027-change-ticket-write-permissions.py

Diff

--- a/Allura/allura/model/types.py
+++ b/Allura/allura/model/types.py
@@ -44,8 +44,4 @@ class ACL(S.Array):
         super(ACL, self).__init__(
             field_type=ACE(permissions), **kwargs)
 
-    def add(self, role):
-        if role not in self:
-            self.append(role)
-
 DENY_ALL = ACE.deny(EVERYONE, ALL_PERMISSIONS)

--- a/scripts/migrations/027-change-ticket-write-permissions.py
+++ b/scripts/migrations/027-change-ticket-write-permissions.py
@@ -14,6 +14,10 @@ from forgewiki.wiki_main import ForgeWikiApp
 log = logging.getLogger(__name__)
 
 
+def add(acl, role):
+    if role not in acl:
+        acl.append(role)
+
 # migration script for change write permission to create + update
 def main():
     query = {'tool_name': {'$regex': '^tickets$', '$options': 'i'}}
@@ -23,11 +27,11 @@ def main():
             role_ids = [(p.role_id, p.access) for p in a.acl if p.permission == 'write']
             for role_id, access in role_ids:
                 if access == M.ACE.DENY:
-                    a.acl.add(M.ACE.deny(role_id, 'create'))
-                    a.acl.add(M.ACE.deny(role_id, 'update'))
+                    add(a.acl, M.ACE.deny(role_id, 'create'))
+                    add(a.acl, M.ACE.deny(role_id, 'update'))
                 else:
-                    a.acl.add(M.ACE.allow(role_id, 'create'))
-                    a.acl.add(M.ACE.allow(role_id, 'update'))
+                    add(a.acl, M.ACE.allow(role_id, 'create'))
+                    add(a.acl, M.ACE.allow(role_id, 'update'))
 
         ThreadLocalORMSession.flush_all()