# HG changeset patch # User Mads Kiilerich # Date 1573919522 -3600 # Node ID 394c7814e710ad56616e2490a0b74ebdd112c92a # Parent 77a0fc238ceedbd9da5bcf91eb89f4991602ae43 app: drop unused "cache" of available_permissions diff -r 77a0fc238cee -r 394c7814e710 kallithea/config/app_cfg.py --- a/kallithea/config/app_cfg.py Sat Nov 16 15:35:22 2019 +0100 +++ b/kallithea/config/app_cfg.py Sat Nov 16 16:52:02 2019 +0100 @@ -34,7 +34,6 @@ import kallithea.lib.locale import kallithea.model.base -from kallithea.lib.auth import set_available_permissions from kallithea.lib.middleware.https_fixup import HttpsFixup from kallithea.lib.middleware.permanent_repo_url import PermanentRepoUrl from kallithea.lib.middleware.simplegit import SimpleGit @@ -162,7 +161,6 @@ load_rcextensions(root_path=config['here']) - set_available_permissions(config) repos_path = make_ui().configitems('paths')[0][1] config['base_path'] = repos_path set_app_settings(config) diff -r 77a0fc238cee -r 394c7814e710 kallithea/controllers/admin/user_groups.py --- a/kallithea/controllers/admin/user_groups.py Sat Nov 16 15:35:22 2019 +0100 +++ b/kallithea/controllers/admin/user_groups.py Sat Nov 16 16:52:02 2019 +0100 @@ -32,7 +32,7 @@ from formencode import htmlfill from sqlalchemy.orm import joinedload from sqlalchemy.sql.expression import func -from tg import app_globals, config, request +from tg import app_globals, request from tg import tmpl_context as c from tg.i18n import ugettext as _ from webob.exc import HTTPFound, HTTPInternalServerError @@ -61,7 +61,6 @@ @LoginRequired(allow_default_user=True) def _before(self, *args, **kwargs): super(UserGroupsController, self)._before(*args, **kwargs) - c.available_permissions = config['available_permissions'] def __load_data(self, user_group_id): c.group_members_obj = sorted((x.user for x in c.user_group.members), diff -r 77a0fc238cee -r 394c7814e710 kallithea/controllers/admin/users.py --- a/kallithea/controllers/admin/users.py Sat Nov 16 15:35:22 2019 +0100 +++ b/kallithea/controllers/admin/users.py Sat Nov 16 16:52:02 2019 +0100 @@ -31,7 +31,7 @@ import formencode from formencode import htmlfill from sqlalchemy.sql.expression import func -from tg import app_globals, config, request +from tg import app_globals, request from tg import tmpl_context as c from tg.i18n import ugettext as _ from webob.exc import HTTPFound, HTTPNotFound @@ -63,7 +63,6 @@ @HasPermissionAnyDecorator('hg.admin') def _before(self, *args, **kwargs): super(UsersController, self)._before(*args, **kwargs) - c.available_permissions = config['available_permissions'] def index(self, format='html'): c.users_list = User.query().order_by(User.username) \ diff -r 77a0fc238cee -r 394c7814e710 kallithea/lib/app_globals.py --- a/kallithea/lib/app_globals.py Sat Nov 16 15:35:22 2019 +0100 +++ b/kallithea/lib/app_globals.py Sat Nov 16 16:52:02 2019 +0100 @@ -39,9 +39,7 @@ """One instance of Globals is created during application initialization and is available during requests via the 'app_globals' variable - """ - self.available_permissions = None # propagated after init_model @property def cache(self): diff -r 77a0fc238cee -r 394c7814e710 kallithea/lib/auth.py --- a/kallithea/lib/auth.py Sat Nov 16 15:35:22 2019 +0100 +++ b/kallithea/lib/auth.py Sat Nov 16 16:52:02 2019 +0100 @@ -594,24 +594,6 @@ return _set or set(['0.0.0.0/0', '::/0']) -def set_available_permissions(config): - """ - This function will propagate globals with all available defined - permission given in db. We don't want to check each time from db for new - permissions since adding a new permission also requires application restart - ie. to decorate new views with the newly created permission - - :param config: current config instance - - """ - log.info('getting information about all available permissions') - try: - all_perms = Session().query(Permission).all() - config['available_permissions'] = [x.permission_name for x in all_perms] - finally: - Session.remove() - - #============================================================================== # CHECK DECORATORS #==============================================================================