Mercurial > kallithea

changeset 6465:c706a8dae2c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
model: inline calls to BaseModel._get_perm
author Søren Løvborg <sorenl@unity3d.com>
date Wed, 18 Jan 2017 16:59:48 +0100
parents d7d1e0a3850a
children 0a3e1a620edf
files kallithea/model/base.py kallithea/model/repo.py kallithea/model/repo_group.py kallithea/model/user.py kallithea/model/user_group.py
diffstat 5 files changed, 14 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/model/base.py	Wed Jan 18 16:56:26 2017 +0100
+++ b/kallithea/model/base.py	Wed Jan 18 16:59:48 2017 +0100
@@ -59,12 +59,3 @@
             self.sa = sa
         else:
             self.sa = meta.Session()
-
-    def _get_perm(self, permission):
-        """
-        Helper method to get permission by ID, or permission name
-
-        :param permission: PermissionID, permission_name or Permission instance
-        """
-        from kallithea.model.db import Permission
-        return Permission.guess_instance(permission)
--- a/kallithea/model/repo.py	Wed Jan 18 16:56:26 2017 +0100
+++ b/kallithea/model/repo.py	Wed Jan 18 16:59:48 2017 +0100
@@ -559,7 +559,7 @@
         """
         user = User.guess_instance(user)
         repo = Repository.guess_instance(repo)
-        permission = self._get_perm(perm)
+        permission = Permission.guess_instance(perm)
 
         # check if we have that permission already
         obj = self.sa.query(UserRepoToPerm) \
@@ -607,7 +607,7 @@
         """
         repo = Repository.guess_instance(repo)
         group_name = self._get_user_group(group_name)
-        permission = self._get_perm(perm)
+        permission = Permission.guess_instance(perm)
 
         # check if we have that permission already
         obj = self.sa.query(UserGroupRepoToPerm) \
--- a/kallithea/model/repo_group.py	Wed Jan 18 16:56:26 2017 +0100
+++ b/kallithea/model/repo_group.py	Wed Jan 18 16:59:48 2017 +0100
@@ -338,7 +338,7 @@
     def add_permission(self, repo_group, obj, obj_type, perm, recursive):
         from kallithea.model.repo import RepoModel
         repo_group = self._get_repo_group(repo_group)
-        perm = self._get_perm(perm)
+        perm = Permission.guess_instance(perm)
 
         for el in repo_group.recursive_groups_and_repos():
             # iterated obj is an instance of a repos group or repository in
@@ -448,7 +448,7 @@
 
         repo_group = self._get_repo_group(repo_group)
         user = User.guess_instance(user)
-        permission = self._get_perm(perm)
+        permission = Permission.guess_instance(perm)
 
         # check if we have that permission already
         obj = self.sa.query(UserRepoGroupToPerm) \
@@ -498,7 +498,7 @@
         """
         repo_group = self._get_repo_group(repo_group)
         group_name = self._get_user_group(group_name)
-        permission = self._get_perm(perm)
+        permission = Permission.guess_instance(perm)
 
         # check if we have that permission already
         obj = self.sa.query(UserGroupRepoGroupToPerm) \
--- a/kallithea/model/user.py	Wed Jan 18 16:56:26 2017 +0100
+++ b/kallithea/model/user.py	Wed Jan 18 16:59:48 2017 +0100
@@ -40,7 +40,7 @@
 from kallithea.lib.utils2 import safe_str, generate_api_key, get_current_authuser
 from kallithea.lib.caching_query import FromCache
 from kallithea.model.base import BaseModel
-from kallithea.model.db import User, UserToPerm, Notification, \
+from kallithea.model.db import Permission, User, UserToPerm, Notification, \
     UserEmailMap, UserIpMap
 from kallithea.lib.exceptions import DefaultUserException, \
     UserOwnsReposException
@@ -420,7 +420,7 @@
         return True
 
     def has_perm(self, user, perm):
-        perm = self._get_perm(perm)
+        perm = Permission.guess_instance(perm)
         user = User.guess_instance(user)
 
         return UserToPerm.query().filter(UserToPerm.user == user) \
@@ -434,7 +434,7 @@
         :param perm:
         """
         user = User.guess_instance(user)
-        perm = self._get_perm(perm)
+        perm = Permission.guess_instance(perm)
         # if this permission is already granted skip it
         _perm = UserToPerm.query() \
             .filter(UserToPerm.user == user) \
@@ -456,7 +456,7 @@
         :param perm:
         """
         user = User.guess_instance(user)
-        perm = self._get_perm(perm)
+        perm = Permission.guess_instance(perm)
 
         UserToPerm.query().filter(
             UserToPerm.user == user,
--- a/kallithea/model/user_group.py	Wed Jan 18 16:56:26 2017 +0100
+++ b/kallithea/model/user_group.py	Wed Jan 18 16:59:48 2017 +0100
@@ -220,7 +220,7 @@
 
     def has_perm(self, user_group, perm):
         user_group = self._get_user_group(user_group)
-        perm = self._get_perm(perm)
+        perm = Permission.guess_instance(perm)
 
         return UserGroupToPerm.query() \
             .filter(UserGroupToPerm.users_group == user_group) \
@@ -228,7 +228,7 @@
 
     def grant_perm(self, user_group, perm):
         user_group = self._get_user_group(user_group)
-        perm = self._get_perm(perm)
+        perm = Permission.guess_instance(perm)
 
         # if this permission is already granted skip it
         _perm = UserGroupToPerm.query() \
@@ -246,7 +246,7 @@
 
     def revoke_perm(self, user_group, perm):
         user_group = self._get_user_group(user_group)
-        perm = self._get_perm(perm)
+        perm = Permission.guess_instance(perm)
 
         obj = UserGroupToPerm.query() \
             .filter(UserGroupToPerm.users_group == user_group) \
@@ -267,7 +267,7 @@
 
         user_group = self._get_user_group(user_group)
         user = User.guess_instance(user)
-        permission = self._get_perm(perm)
+        permission = Permission.guess_instance(perm)
 
         # check if we have that permission already
         obj = self.sa.query(UserUserGroupToPerm) \
@@ -314,7 +314,7 @@
         """
         target_user_group = self._get_user_group(target_user_group)
         user_group = self._get_user_group(user_group)
-        permission = self._get_perm(perm)
+        permission = Permission.guess_instance(perm)
         # forbid assigning same user group to itself
         if target_user_group == user_group:
             raise RepoGroupAssignmentError('target repo:%s cannot be '