kallithea Changeset - dd6e3441b4f4

Changeset - dd6e3441b4f4

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Søren Løvborg - 9 years ago 2016-09-15 17:40:29
sorenl@unity3d.com

cleanup: remove redundant database loads

Don't take a database object, grab its ID, then use the ID to load
the same database object once again. This also applies to creating
AuthUser objects, which will happily take a User object instead of
a user_id.

2 files changed with 4 insertions and 7 deletions:

kallithea/controllers/admin/users.py

kallithea/model/repo.py

0 comments (0 inline, 0 general)

kallithea/controllers/admin/users.py

➞

Show inline comments

@@ @@ -225,13 +225,13 @@ class UsersController(BaseController): @@
             encoding="UTF-8",
             force_defaults=False)
     def edit_advanced(self, id):
         c.user = self._get_user_or_raise_if_default(id)
         c.active = 'advanced'
-        c.perm_user = AuthUser(user_id=id)
+        c.perm_user = AuthUser(dbuser=c.user)
         c.ip_addr = self.ip_addr
         umodel = UserModel()
         defaults = c.user.get_dict()
         defaults.update({
             'create_repo_perm': umodel.has_perm(c.user, 'hg.create.repository'),
@@ @@ -278,16 +278,13 @@ class UsersController(BaseController): @@
     def delete_api_key(self, id):
         c.user = self._get_user_or_raise_if_default(id)
         api_key = request.POST.get('del_api_key')
         if request.POST.get('del_api_key_builtin'):
             user = User.get(c.user.user_id)
             if user is not None:
                 user.api_key = generate_api_key()
                 Session().add(user)
             c.user.api_key = generate_api_key()
                 Session().commit()
                 h.flash(_("API key successfully reset"), category='success')
         elif api_key:
             ApiKeyModel().delete(api_key, c.user.user_id)
             Session().commit()
             h.flash(_("API key successfully deleted"), category='success')
@@ @@ -297,13 +294,13 @@ class UsersController(BaseController): @@
     def update_account(self, id):
         pass
     def edit_perms(self, id):
         c.user = self._get_user_or_raise_if_default(id)
         c.active = 'perms'
-        c.perm_user = AuthUser(user_id=id)
+        c.perm_user = AuthUser(dbuser=c.user)
         c.ip_addr = self.ip_addr
         umodel = UserModel()
         defaults = c.user.get_dict()
         defaults.update({
             'create_repo_perm': umodel.has_perm(c.user, 'hg.create.repository'),

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -120,13 +120,13 @@ class RepoModel(BaseModel): @@
         Gets all repositories that user have at least read access
         :param user:
         """
         from kallithea.lib.auth import AuthUser
         user = self._get_user(user)
-        repos = AuthUser(user_id=user.user_id).permissions['repositories']
+        repos = AuthUser(dbuser=user).permissions['repositories']
         access_check = lambda r: r[1] in ['repository.read',
                                           'repository.write',
                                           'repository.admin']
         repos = [x[0] for x in filter(access_check, repos.items())]
         return Repository.query().filter(Repository.repo_name.in_(repos))

0 comments (0 inline, 0 general)