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

Correct reversing states back to groups.

Browse Source
This commit is contained in:
Adarnof 2018-04-30 17:24:31 -04:00
parent ca10fbcde5
commit 53a9d72c4a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
allianceauth/authentication/migrations/0015_user_profiles.py
View File

@ -43,7 +43,7 @@ def create_member_group(apps, schema_editor):
member_state_name = getattr(settings, 'DEFAULT_AUTH_GROUP', 'Member') member_state_name = getattr(settings, 'DEFAULT_AUTH_GROUP', 'Member')
try: try:
g = Group.objects.get(name=member_state_name) g, _ = Group.objects.get_or_create(name=member_state_name)
# move permissions back # move permissions back
state = State.objects.get(name=member_state_name) state = State.objects.get(name=member_state_name)
[g.permissions.add(p.pk) for p in state.permissions.all()] [g.permissions.add(p.pk) for p in state.permissions.all()]
@ -51,7 +51,7 @@ def create_member_group(apps, schema_editor):
# move users back # move users back
for profile in state.userprofile_set.all().select_related('user'): for profile in state.userprofile_set.all().select_related('user'):
profile.user.groups.add(g.pk) profile.user.groups.add(g.pk)
except (Group.DoesNotExist, State.DoesNotExist): except State.DoesNotExist:
pass pass
@ -67,7 +67,7 @@ def create_blue_state(apps, schema_editor):
# move group permissions to state # move group permissions to state
g = Group.objects.get(name=blue_state_name) g = Group.objects.get(name=blue_state_name)
[s.permissions.add(p.pk) for p in g.permissions.all()] [s.permissions.add(p.pk) for p in g.permissions.all()]
g.permissions.clear() g.delete()
except Group.DoesNotExist: except Group.DoesNotExist:
pass pass
@ -84,7 +84,7 @@ def create_blue_group(apps, schema_editor):
blue_state_name = getattr(settings, 'DEFAULT_BLUE_GROUP', 'Blue') blue_state_name = getattr(settings, 'DEFAULT_BLUE_GROUP', 'Blue')
try: try:
g = Group.objects.get(name=blue_state_name) g, _ = Group.objects.get_or_create(name=blue_state_name)
# move permissions back # move permissions back
state = State.objects.get(name=blue_state_name) state = State.objects.get(name=blue_state_name)
[g.permissions.add(p.pk) for p in state.permissions.all()] [g.permissions.add(p.pk) for p in state.permissions.all()]
@ -92,7 +92,7 @@ def create_blue_group(apps, schema_editor):
# move users back # move users back
for profile in state.userprofile_set.all().select_related('user'): for profile in state.userprofile_set.all().select_related('user'):
profile.user.groups.add(g.pk) profile.user.groups.add(g.pk)
except (Group.DoesNotExist, State.DoesNotExist): except State.DoesNotExist:
pass pass