Commit: ae0468986ff1a10b7f0944421e8ec3d4e474dcd5 - allura (git)

allura

Commit MetaInfo

• Revisión: ae0468986ff1a10b7f0944421e8ec3d4e474dcd5 (tree)
• Tiempo: 2011-04-28 03:48:21
• Autor: Rick Copeland <rcopeland@geek...>
• Commiter: Rick Copeland

Log Message

[#1909] Handle cases where our database contains old, unknown permissions in the ACL

Signed-off-by: Rick Copeland <[e-mail]>

Cambiar Resumen

• modified: Allura/allura/app.py

Diferencia incremental

--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -291,7 +291,11 @@ class DefaultAdminController(BaseController):
         permissions = dict((p, []) for p in self.app.permissions)
         for ace in self.app.config.acl:
             if ace.access == model.ACE.ALLOW:
-                permissions[ace.permission].append(ace.role_id)
+                try:
+                    permissions[ace.permission].append(ace.role_id)
+                except KeyError:
+                    # old, unknown permission
+                    pass
         return dict(
             app=self.app,
             allow_config=has_access(c.project, 'admin')(),