Commit: b71963345ea3a1be72ff9c68865ca21d934c927e - allura (git)

allura

Commit MetaInfo

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

Log Message

[#1909] Make bootstrap Projects nbhd the only one allowing willy-nilly registration

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

Cambiar Resumen

• modified: Allura/allura/lib/plugin.py
• modified: Allura/allura/websetup/bootstrap.py

Diferencia incremental

--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -23,6 +23,7 @@ from ming.orm import session
 from ming.orm import ThreadLocalORMSession
 
 from allura.lib import helpers as h
+from allura.lib import security
 from allura.lib import exceptions as forge_exc
 
 log = logging.getLogger(__name__)
@@ -292,7 +293,7 @@ class ProjectRegistrationProvider(object):
         '''
         return []
 
-    def register_neighborhood_project(self, neighborhood, users):
+    def register_neighborhood_project(self, neighborhood, users, allow_register=False):
         from allura import model as M
         shortname='--init--'
         p = M.Project.query.get(
@@ -321,6 +322,9 @@ class ProjectRegistrationProvider(object):
             ThreadLocalORMSession.close_all()
             log.exception('Error registering project %s' % p)
             raise
+        if allow_register:
+            role_auth = M.ProjectRole.authenticated(p)
+            security.simple_grant(p.acl, role_auth._id, 'register')
         return p
 
     def register_project(self, neighborhood, shortname, user, user_project):

--- a/Allura/allura/websetup/bootstrap.py
+++ b/Allura/allura/websetup/bootstrap.py
@@ -87,7 +87,7 @@ def bootstrap(command, conf, vars):
     n_adobe = M.Neighborhood(name='Adobe', url_prefix='/adobe/')
     assert tg.config['auth.method'] == 'local'
     project_reg = plugin.ProjectRegistrationProvider.get()
-    p_projects = project_reg.register_neighborhood_project(n_projects, [root])
+    p_projects = project_reg.register_neighborhood_project(n_projects, [root], allow_register=True)
     p_users = project_reg.register_neighborhood_project(n_users, [root])
     p_adobe = project_reg.register_neighborhood_project(n_adobe, [root])
     ThreadLocalORMSession.flush_all()