Commit: 9424e550b02cf4a711272eafbaef55e031323ac2 - allura (git)

allura

Commit MetaInfo

• Revision: 9424e550b02cf4a711272eafbaef55e031323ac2 (tree)
• Zeit: 2012-07-12 03:04:35
• Autor: Cory Johns <johnsca@geek...>
• Commiter: Cory Johns

Log Message

[#3892] Do not duplicate CREATE and UPDATE permission of migration 027 is re-run

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,4 +44,8 @@ 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
@@ -23,11 +23,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.append(M.ACE.deny(role_id, 'create'))
-                    a.acl.append(M.ACE.deny(role_id, 'update'))
+                    a.acl.add(M.ACE.deny(role_id, 'create'))
+                    a.acl.add(M.ACE.deny(role_id, 'update'))
                 else:
-                    a.acl.append(M.ACE.allow(role_id, 'create'))
-                    a.acl.append(M.ACE.allow(role_id, 'update'))
+                    a.acl.add(M.ACE.allow(role_id, 'create'))
+                    a.acl.add(M.ACE.allow(role_id, 'update'))
 
         ThreadLocalORMSession.flush_all()