提交: e388ce210d390856fdd0a9604a9cb5d10dc0e74c - allura (git)

allura

Commit MetaInfo

• 修訂: e388ce210d390856fdd0a9604a9cb5d10dc0e74c (tree)
• 時間: 2011-11-17 04:48:17
• 作者: Jenny Steele <jsteele@geek...>
• Commiter: Wayne Witzel III

Log Message

[#3226] Added option to specify apps to install during register project so neighborhoods with a project template have more control

Signed-off-by: Jenny Steele <[e-mail]>

Change Summary

• modified: Allura/allura/controllers/project.py
• modified: Allura/allura/lib/plugin.py
• modified: Allura/allura/model/neighborhood.py
• modified: Allura/allura/tests/functional/test_neighborhood.py

差異

--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -170,11 +170,17 @@ class NeighborhoodController(object):
         project_description = h.really_unicode(project_description or '').encode('utf-8')
         project_name = h.really_unicode(project_name or '').encode('utf-8')
         project_unixname = h.really_unicode(project_unixname or '').encode('utf-8').lower()
-        c.project = neighborhood.register_project(project_unixname, project_name=project_name, private_project=private_project)
+        apps = None
+        if 'tools' in project_template:
+            apps = []
+        c.project = neighborhood.register_project(project_unixname, project_name=project_name, private_project=private_project, apps=apps)
         if project_description:
             c.project.short_description = project_description
         ming.orm.ormsession.ThreadLocalORMSession.flush_all()
-        offset = int(c.project.ordered_mounts(include_search=True)[-1]['ordinal']) + 1
+        ordered_mounts = c.project.ordered_mounts(include_search=True)
+        offset = 0
+        if len(ordered_mounts):
+            offset = int(ordered_mounts[-1]['ordinal']) + 1
         if 'tools' in project_template:
             for i, tool in enumerate(project_template['tools'].keys()):
                 tool_config = project_template['tools'][tool]
@@ -198,16 +204,17 @@ class NeighborhoodController(object):
                 troves = getattr(c.project,'trove_%s'%trove_type)
                 for trove_id in project_template['trove_cats'][trove_type]:
                     troves.append(M.TroveCategory.query.get(trove_cat_id=trove_id)._id)
-        if 'home_options' in project_template:
+        if 'home_options' in project_template and c.project.app_config('home'):
             options = c.project.app_config('home').options
             for option in project_template['home_options'].keys():
                 options[option] = project_template['home_options'][option]
-        from forgewiki import model as WM
         home_app = c.project.app_instance('home')
-        if 'home_text' in project_template:
-            WM.Page.query.get(app_config_id=home_app.config._id).text = project_template['home_text']
-        else:
-            WM.Page.query.get(app_config_id=home_app.config._id).text = """[[project_admins]]
+        if home_app:
+            from forgewiki import model as WM
+            if 'home_text' in project_template:
+                WM.Page.query.get(app_config_id=home_app.config._id).text = project_template['home_text']
+            else:
+                WM.Page.query.get(app_config_id=home_app.config._id).text = """[[project_admins]]
 [[download_button]]"""
         if 'icon' in project_template:
             icon_file = StringIO(urlopen(project_template['icon']['url']).read())

--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -329,7 +329,7 @@ class ProjectRegistrationProvider(object):
             state(p).soil()
         return p
 
-    def register_project(self, neighborhood, shortname, project_name, user, user_project, private_project):
+    def register_project(self, neighborhood, shortname, project_name, user, user_project, private_project, apps=None):
         '''Register a new project in the neighborhood.  The given user will
         become the project's superuser.
         '''
@@ -351,7 +351,8 @@ class ProjectRegistrationProvider(object):
             p.configure_project(
                 users=[user],
                 is_user_project=user_project,
-                is_private_project=private_project)
+                is_private_project=private_project,
+                apps=apps)
         except forge_exc.ProjectConflict:
             raise
         except:

--- a/Allura/allura/model/neighborhood.py
+++ b/Allura/allura/model/neighborhood.py
@@ -68,7 +68,7 @@ class Neighborhood(MappedClass):
         else:
             return url
 
-    def register_project(self, shortname, user=None, project_name=None, user_project=False, private_project=False):
+    def register_project(self, shortname, user=None, project_name=None, user_project=False, private_project=False, apps=None):
         '''Register a new project in the neighborhood.  The given user will
         become the project's superuser.  If no user is specified, c.user is used.
         '''
@@ -76,7 +76,7 @@ class Neighborhood(MappedClass):
         if project_name is None:
             project_name = shortname
         return provider.register_project(
-            self, shortname, project_name, user or getattr(c,'user',None), user_project, private_project)
+            self, shortname, project_name, user or getattr(c,'user',None), user_project, private_project, apps)
 
     def bind_controller(self, controller):
         from allura.controllers.project import NeighborhoodController

--- a/Allura/allura/tests/functional/test_neighborhood.py
+++ b/Allura/allura/tests/functional/test_neighborhood.py
@@ -202,11 +202,13 @@ class TestNeighborhood(TestController):
     "filename":"icon.png"
   },
   "tools":{
+    "wiki":{"label":"Home","mount_point":"home"},
     "discussion":{"label":"Discussion","mount_point":"discussion"},
     "blog":{"label":"News","mount_point":"news","options":{
       "show_discussion":false
     }},
-    "downloads":{"label":"Downloads","mount_point":"downloads"}
+    "downloads":{"label":"Downloads","mount_point":"downloads"},
+    "admin":{"label":"Admin","mount_point":"admin"}
   },
   "tool_order":["home","discussion","news","downloads","admin"],
   "labels":["mmi"],