Switch to unified view

a/Allura/allura/model/project.py b/Allura/allura/model/project.py
...
...
3
from datetime import datetime
3
from datetime import datetime
4
4
5
from tg import config
5
from tg import config
6
from pylons import tmpl_context as c, app_globals as g
6
from pylons import tmpl_context as c, app_globals as g
7
from pylons import request
7
from pylons import request
8
from paste.deploy.converters import asbool
8
9
9
from ming import schema as S
10
from ming import schema as S
10
from ming.utils import LazyProperty
11
from ming.utils import LazyProperty
11
from ming.orm import ThreadLocalORMSession
12
from ming.orm import ThreadLocalORMSession
12
from ming.orm import session, state, MapperExtension
13
from ming.orm import session, state, MapperExtension
...
...
707
        from allura import model as M
708
        from allura import model as M
708
709
709
        self.notifications_disabled = True
710
        self.notifications_disabled = True
710
        if users is None: users = [ c.user ]
711
        if users is None: users = [ c.user ]
711
        if apps is None:
712
        if apps is None:
713
            apps = []
712
            if is_user_project:
714
            if is_user_project:
713
                apps = [('Wiki', 'wiki', 'Wiki'),
715
                apps += [('Wiki', 'wiki', 'Wiki'),
714
                        ('profile', 'profile', 'Profile'),
716
                        ('profile', 'profile', 'Profile'),
717
                       ]
718
            apps += [
715
                        ('admin', 'admin', 'Admin'),
719
                ('admin', 'admin', 'Admin'),
716
                        ('search', 'search', 'Search'),
720
                ('search', 'search', 'Search'),
721
            ]
722
            if asbool(config.get('activitystream.enabled', False)):
717
                        ('activity', 'activity', 'Activity')]
723
                apps.append(('activity', 'activity', 'Activity'))
718
            else:
719
                apps = [('admin', 'admin', 'Admin'),
720
                        ('search', 'search', 'Search'),
721
                        ('activity', 'activity', 'Activity')]
722
        with h.push_config(c, project=self, user=users[0]):
724
        with h.push_config(c, project=self, user=users[0]):
723
            # Install default named roles (#78)
725
            # Install default named roles (#78)
724
            root_project_id=self.root_project._id
726
            root_project_id=self.root_project._id
725
            role_admin = M.ProjectRole.upsert(name='Admin', project_id=root_project_id)
727
            role_admin = M.ProjectRole.upsert(name='Admin', project_id=root_project_id)
726
            role_developer = M.ProjectRole.upsert(name='Developer', project_id=root_project_id)
728
            role_developer = M.ProjectRole.upsert(name='Developer', project_id=root_project_id)