kallithea Changeset - c706a8dae2c8

Changeset - c706a8dae2c8

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Søren Løvborg - 9 years ago 2017-01-18 16:59:48
sorenl@unity3d.com

model: inline calls to BaseModel._get_perm

5 files changed with 14 insertions and 23 deletions:

kallithea/model/base.py

kallithea/model/repo.py

kallithea/model/repo_group.py

kallithea/model/user.py

kallithea/model/user_group.py

0 comments (0 inline, 0 general)

kallithea/model/base.py

➞

Show inline comments

@@ @@ -59,12 +59,3 @@ class BaseModel(object): @@
             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)

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -559,7 +559,7 @@ class RepoModel(BaseModel): @@
         """
         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 @@ class RepoModel(BaseModel): @@
         """
         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) \

kallithea/model/repo_group.py

➞

Show inline comments

@@ @@ -338,7 +338,7 @@ class RepoGroupModel(BaseModel): @@
     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 @@ class RepoGroupModel(BaseModel): @@
         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 @@ class RepoGroupModel(BaseModel): @@
         """
         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) \

kallithea/model/user.py

➞

Show inline comments

@@ @@ -40,7 +40,7 @@ from sqlalchemy.exc import DatabaseError @@
 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 @@ class UserModel(BaseModel): @@
         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 @@ class UserModel(BaseModel): @@
         :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 @@ class UserModel(BaseModel): @@
         :param perm:
         """
         user = User.guess_instance(user)
-        perm = self._get_perm(perm)
+        perm = Permission.guess_instance(perm)
         UserToPerm.query().filter(
             UserToPerm.user == user,

kallithea/model/user_group.py

➞

Show inline comments

@@ @@ -220,7 +220,7 @@ class UserGroupModel(BaseModel): @@
     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 @@ class UserGroupModel(BaseModel): @@
     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 @@ class UserGroupModel(BaseModel): @@
     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 @@ class UserGroupModel(BaseModel): @@
         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 @@ class UserGroupModel(BaseModel): @@
         """
         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 '

0 comments (0 inline, 0 general)