Switch to unified view

a/Allura/allura/app.py b/Allura/allura/app.py
...
...
6
from tg.decorators import without_trailing_slash
6
from tg.decorators import without_trailing_slash
7
from pylons import request, app_globals as g, tmpl_context as c
7
from pylons import request, app_globals as g, tmpl_context as c
8
from bson import ObjectId
8
from bson import ObjectId
9
9
10
from ming.orm import session, state
10
from ming.orm import session, state
11
from ming.utils import LazyProperty
11
12
12
from allura.lib.helpers import push_config, vardec
13
from allura.lib.helpers import push_config, vardec
13
from allura.lib.security import require, has_access, require_access
14
from allura.lib.security import require, has_access, require_access
14
from allura import model
15
from allura import model
15
from allura.controllers import BaseController
16
from allura.controllers import BaseController
...
...
135
        48:'images/admin_48.png'
136
        48:'images/admin_48.png'
136
    }
137
    }
137
138
138
    def __init__(self, project, app_config_object):
139
    def __init__(self, project, app_config_object):
139
        self.project = project
140
        self.project = project
140
        self.config = app_config_object # pragma: no cover
141
        self.config = app_config_object
141
        self.admin = DefaultAdminController(self)
142
        self.admin = DefaultAdminController(self)
142
        self.url = self.config.url()
143
144
    @LazyProperty
145
    def url(self):
146
        return self.config.url(project=self.project)
143
147
144
    @property
148
    @property
145
    def acl(self):
149
    def acl(self):
146
        return self.config.acl
150
        return self.config.acl
147
151