You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/03/17 20:10:45 UTC
[3/7] git commit: [#5973] don't install ForgeActivity app if it's not
enabled
[#5973] don't install ForgeActivity app if it's not enabled
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/810ff834
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/810ff834
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/810ff834
Branch: refs/heads/db/5973
Commit: 810ff8343c2d0ff6654bdd16feff5a571be5a04b
Parents: 3860015
Author: Dave Brondsema <db...@geek.net>
Authored: Thu Mar 14 13:20:20 2013 -0400
Committer: Dave Brondsema <db...@geek.net>
Committed: Sun Mar 17 12:10:12 2013 -0700
----------------------------------------------------------------------
Allura/allura/model/project.py | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/810ff834/Allura/allura/model/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/project.py b/Allura/allura/model/project.py
index 9f07f67..39509ff 100644
--- a/Allura/allura/model/project.py
+++ b/Allura/allura/model/project.py
@@ -5,6 +5,7 @@ from datetime import datetime
from tg import config
from pylons import tmpl_context as c, app_globals as g
from pylons import request
+from paste.deploy.converters import asbool
from ming import schema as S
from ming.utils import LazyProperty
@@ -709,16 +710,17 @@ class Project(MappedClass, ActivityNode, ActivityObject):
self.notifications_disabled = True
if users is None: users = [ c.user ]
if apps is None:
+ apps = []
if is_user_project:
- apps = [('Wiki', 'wiki', 'Wiki'),
+ apps += [('Wiki', 'wiki', 'Wiki'),
('profile', 'profile', 'Profile'),
- ('admin', 'admin', 'Admin'),
- ('search', 'search', 'Search'),
- ('activity', 'activity', 'Activity')]
- else:
- apps = [('admin', 'admin', 'Admin'),
- ('search', 'search', 'Search'),
- ('activity', 'activity', 'Activity')]
+ ]
+ apps += [
+ ('admin', 'admin', 'Admin'),
+ ('search', 'search', 'Search'),
+ ]
+ if asbool(config.get('activitystream.enabled', False)):
+ apps.append(('activity', 'activity', 'Activity'))
with h.push_config(c, project=self, user=users[0]):
# Install default named roles (#78)
root_project_id=self.root_project._id