Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-12 05:50:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add user as return value to add permission methods

Browse Source
This commit is contained in:
ErikKalkoken 2020-09-15 12:35:58 +02:00
parent feb65980d4
commit bd1ed6ff73
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
allianceauth/tests/auth_utils.py
View File

@ -146,7 +146,7 @@ class AuthUtils:
if alliance_id: if alliance_id:
try: try:
alliance_id = int(alliance_id) alliance_id = int(alliance_id)
except: except Exception:
alliance_id = None alliance_id = None
char = EveCharacter.objects.create( char = EveCharacter.objects.create(
@ -180,7 +180,7 @@ class AuthUtils:
if alliance_id: if alliance_id:
try: try:
alliance_id = int(alliance_id) alliance_id = int(alliance_id)
except: except Exception:
alliance_id = None alliance_id = None
char = EveCharacter.objects.create( char = EveCharacter.objects.create(
@ -220,7 +220,7 @@ class AuthUtils:
) )
@classmethod @classmethod
def add_permissions_to_user(cls, perms, user, disconnect_signals=True): def add_permissions_to_user(cls, perms, user, disconnect_signals=True) -> User:
"""add list of permissions to user """add list of permissions to user
perms: list of Permission objects perms: list of Permission objects
@ -239,10 +239,12 @@ class AuthUtils:
if disconnect_signals: if disconnect_signals:
cls.connect_signals() cls.connect_signals()
return user
@classmethod @classmethod
def add_permission_to_user_by_name( def add_permission_to_user_by_name(
cls, perm, user, disconnect_signals=True cls, perm, user, disconnect_signals=True
): ) -> User:
"""returns permission specified by qualified name """returns permission specified by qualified name
perm: Permission name as 'app_label.codename' perm: Permission name as 'app_label.codename'
@ -252,7 +254,7 @@ class AuthUtils:
disconnect_signals: whether to run process without signals disconnect_signals: whether to run process without signals
""" """
p = cls.get_permission_by_name(perm) p = cls.get_permission_by_name(perm)
cls.add_permissions_to_user([p], user, disconnect_signals) return cls.add_permissions_to_user([p], user, disconnect_signals)
@staticmethod @staticmethod
def get_permission_by_name(perm: str) -> Permission: def get_permission_by_name(perm: str) -> Permission:
@ -270,6 +272,7 @@ class AuthUtils:
content_type__app_label=perm_parts[0], codename=perm_parts[1] content_type__app_label=perm_parts[0], codename=perm_parts[1]
) )
class BaseViewTestCase(TestCase): class BaseViewTestCase(TestCase):
def setUp(self): def setUp(self):
self.member = AuthUtils.create_member('auth_member') self.member = AuthUtils.create_member('auth_member')

2
allianceauth/tests/test_auth_utils.py
View File

@ -39,7 +39,7 @@ class TestAuthUtils(TestCase):
def test_can_add_permission_to_user_by_name(self): def test_can_add_permission_to_user_by_name(self):
user = AuthUtils.create_user('Bruce Wayne') user = AuthUtils.create_user('Bruce Wayne')
AuthUtils.add_permission_to_user_by_name( user = AuthUtils.add_permission_to_user_by_name(
'auth.timer_management', user 'auth.timer_management', user
) )
self.assertTrue(user.has_perm('auth.timer_management')) self.assertTrue(user.has_perm('auth.timer_management'))