Mercurial > kallithea
changeset 6233:dd6e3441b4f4
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.
author | Søren Løvborg <sorenl@unity3d.com> |
---|---|
date | Thu, 15 Sep 2016 17:40:29 +0200 |
parents | 90af0cdf02d8 |
children | e99a33d7d7f5 |
files | kallithea/controllers/admin/users.py kallithea/model/repo.py |
diffstat | 2 files changed, 6 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/admin/users.py Thu Sep 15 17:42:59 2016 +0200 +++ b/kallithea/controllers/admin/users.py Thu Sep 15 17:40:29 2016 +0200 @@ -228,7 +228,7 @@ 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() @@ -281,12 +281,9 @@ 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) - Session().commit() - h.flash(_("API key successfully reset"), category='success') + 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() @@ -300,7 +297,7 @@ 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()
--- a/kallithea/model/repo.py Thu Sep 15 17:42:59 2016 +0200 +++ b/kallithea/model/repo.py Thu Sep 15 17:40:29 2016 +0200 @@ -123,7 +123,7 @@ """ 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']