Show More
@@ -34,7 +34,6 b' from tg.support.converters import asbool' | |||||
34 |
|
34 | |||
35 | import kallithea.lib.locale |
|
35 | import kallithea.lib.locale | |
36 | import kallithea.model.base |
|
36 | import kallithea.model.base | |
37 | from kallithea.lib.auth import set_available_permissions |
|
|||
38 | from kallithea.lib.middleware.https_fixup import HttpsFixup |
|
37 | from kallithea.lib.middleware.https_fixup import HttpsFixup | |
39 | from kallithea.lib.middleware.permanent_repo_url import PermanentRepoUrl |
|
38 | from kallithea.lib.middleware.permanent_repo_url import PermanentRepoUrl | |
40 | from kallithea.lib.middleware.simplegit import SimpleGit |
|
39 | from kallithea.lib.middleware.simplegit import SimpleGit | |
@@ -162,7 +161,6 b' def setup_configuration(app):' | |||||
162 |
|
161 | |||
163 | load_rcextensions(root_path=config['here']) |
|
162 | load_rcextensions(root_path=config['here']) | |
164 |
|
163 | |||
165 | set_available_permissions(config) |
|
|||
166 | repos_path = make_ui().configitems('paths')[0][1] |
|
164 | repos_path = make_ui().configitems('paths')[0][1] | |
167 | config['base_path'] = repos_path |
|
165 | config['base_path'] = repos_path | |
168 | set_app_settings(config) |
|
166 | set_app_settings(config) |
@@ -32,7 +32,7 b' import formencode' | |||||
32 | from formencode import htmlfill |
|
32 | from formencode import htmlfill | |
33 | from sqlalchemy.orm import joinedload |
|
33 | from sqlalchemy.orm import joinedload | |
34 | from sqlalchemy.sql.expression import func |
|
34 | from sqlalchemy.sql.expression import func | |
35 |
from tg import app_globals, |
|
35 | from tg import app_globals, request | |
36 | from tg import tmpl_context as c |
|
36 | from tg import tmpl_context as c | |
37 | from tg.i18n import ugettext as _ |
|
37 | from tg.i18n import ugettext as _ | |
38 | from webob.exc import HTTPFound, HTTPInternalServerError |
|
38 | from webob.exc import HTTPFound, HTTPInternalServerError | |
@@ -61,7 +61,6 b' class UserGroupsController(BaseControlle' | |||||
61 | @LoginRequired(allow_default_user=True) |
|
61 | @LoginRequired(allow_default_user=True) | |
62 | def _before(self, *args, **kwargs): |
|
62 | def _before(self, *args, **kwargs): | |
63 | super(UserGroupsController, self)._before(*args, **kwargs) |
|
63 | super(UserGroupsController, self)._before(*args, **kwargs) | |
64 | c.available_permissions = config['available_permissions'] |
|
|||
65 |
|
64 | |||
66 | def __load_data(self, user_group_id): |
|
65 | def __load_data(self, user_group_id): | |
67 | c.group_members_obj = sorted((x.user for x in c.user_group.members), |
|
66 | c.group_members_obj = sorted((x.user for x in c.user_group.members), |
@@ -31,7 +31,7 b' import traceback' | |||||
31 | import formencode |
|
31 | import formencode | |
32 | from formencode import htmlfill |
|
32 | from formencode import htmlfill | |
33 | from sqlalchemy.sql.expression import func |
|
33 | from sqlalchemy.sql.expression import func | |
34 |
from tg import app_globals, |
|
34 | from tg import app_globals, request | |
35 | from tg import tmpl_context as c |
|
35 | from tg import tmpl_context as c | |
36 | from tg.i18n import ugettext as _ |
|
36 | from tg.i18n import ugettext as _ | |
37 | from webob.exc import HTTPFound, HTTPNotFound |
|
37 | from webob.exc import HTTPFound, HTTPNotFound | |
@@ -63,7 +63,6 b' class UsersController(BaseController):' | |||||
63 | @HasPermissionAnyDecorator('hg.admin') |
|
63 | @HasPermissionAnyDecorator('hg.admin') | |
64 | def _before(self, *args, **kwargs): |
|
64 | def _before(self, *args, **kwargs): | |
65 | super(UsersController, self)._before(*args, **kwargs) |
|
65 | super(UsersController, self)._before(*args, **kwargs) | |
66 | c.available_permissions = config['available_permissions'] |
|
|||
67 |
|
66 | |||
68 | def index(self, format='html'): |
|
67 | def index(self, format='html'): | |
69 | c.users_list = User.query().order_by(User.username) \ |
|
68 | c.users_list = User.query().order_by(User.username) \ |
@@ -39,9 +39,7 b' class Globals(object):' | |||||
39 | """One instance of Globals is created during application |
|
39 | """One instance of Globals is created during application | |
40 | initialization and is available during requests via the |
|
40 | initialization and is available during requests via the | |
41 | 'app_globals' variable |
|
41 | 'app_globals' variable | |
42 |
|
||||
43 | """ |
|
42 | """ | |
44 | self.available_permissions = None # propagated after init_model |
|
|||
45 |
|
43 | |||
46 | @property |
|
44 | @property | |
47 | def cache(self): |
|
45 | def cache(self): |
@@ -594,24 +594,6 b' class AuthUser(object):' | |||||
594 | return _set or set(['0.0.0.0/0', '::/0']) |
|
594 | return _set or set(['0.0.0.0/0', '::/0']) | |
595 |
|
595 | |||
596 |
|
596 | |||
597 | def set_available_permissions(config): |
|
|||
598 | """ |
|
|||
599 | This function will propagate globals with all available defined |
|
|||
600 | permission given in db. We don't want to check each time from db for new |
|
|||
601 | permissions since adding a new permission also requires application restart |
|
|||
602 | ie. to decorate new views with the newly created permission |
|
|||
603 |
|
||||
604 | :param config: current config instance |
|
|||
605 |
|
||||
606 | """ |
|
|||
607 | log.info('getting information about all available permissions') |
|
|||
608 | try: |
|
|||
609 | all_perms = Session().query(Permission).all() |
|
|||
610 | config['available_permissions'] = [x.permission_name for x in all_perms] |
|
|||
611 | finally: |
|
|||
612 | Session.remove() |
|
|||
613 |
|
||||
614 |
|
||||
615 | #============================================================================== |
|
597 | #============================================================================== | |
616 | # CHECK DECORATORS |
|
598 | # CHECK DECORATORS | |
617 | #============================================================================== |
|
599 | #============================================================================== |
General Comments 0
You need to be logged in to leave comments.
Login now