From 86f57ccd56fc9024e77f7515111419de020dac75 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Tue, 8 May 2018 10:06:58 -0400 Subject: [PATCH] Allow reversing service migrations. This is probably the wrong way as we should really take care of removing the permission we added, but I don't see a reason anyone would need to migrate back that far as auth wouldn't work anymore without XML api (and even so newer installs don't have the settings referenced so permissions are not automagically added by the migration). So noop is bad but acceptable to me. Thanks @mmolitor87 --- .../modules/discord/migrations/0002_service_permissions.py | 2 +- .../modules/discourse/migrations/0002_service_permissions.py | 2 +- .../modules/ips4/migrations/0002_service_permissions.py | 2 +- .../modules/market/migrations/0002_service_permissions.py | 2 +- .../modules/mumble/migrations/0006_service_permissions.py | 2 +- .../modules/openfire/migrations/0002_service_permissions.py | 2 +- .../modules/phpbb3/migrations/0002_service_permissions.py | 2 +- .../services/modules/smf/migrations/0002_service_permissions.py | 2 +- .../modules/teamspeak3/migrations/0004_service_permissions.py | 2 +- .../modules/xenforo/migrations/0002_service_permissions.py | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/allianceauth/services/modules/discord/migrations/0002_service_permissions.py b/allianceauth/services/modules/discord/migrations/0002_service_permissions.py index 39a2ff2c..7f1fd92e 100644 --- a/allianceauth/services/modules/discord/migrations/0002_service_permissions.py +++ b/allianceauth/services/modules/discord/migrations/0002_service_permissions.py @@ -57,5 +57,5 @@ class Migration(migrations.Migration): name='discorduser', options={'permissions': (('access_discord', 'Can access the Discord service'),)}, ), - migrations.RunPython(migrate_service_enabled), + migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop), ] diff --git a/allianceauth/services/modules/discourse/migrations/0002_service_permissions.py b/allianceauth/services/modules/discourse/migrations/0002_service_permissions.py index 14947733..b09436ee 100644 --- a/allianceauth/services/modules/discourse/migrations/0002_service_permissions.py +++ b/allianceauth/services/modules/discourse/migrations/0002_service_permissions.py @@ -58,5 +58,5 @@ class Migration(migrations.Migration): name='discourseuser', options={'permissions': (('access_discourse', 'Can access the Discourse service'),)}, ), - migrations.RunPython(migrate_service_enabled), + migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop), ] diff --git a/allianceauth/services/modules/ips4/migrations/0002_service_permissions.py b/allianceauth/services/modules/ips4/migrations/0002_service_permissions.py index ff69462b..760f769b 100644 --- a/allianceauth/services/modules/ips4/migrations/0002_service_permissions.py +++ b/allianceauth/services/modules/ips4/migrations/0002_service_permissions.py @@ -57,5 +57,5 @@ class Migration(migrations.Migration): name='ips4user', options={'permissions': (('access_ips4', 'Can access the IPS4 service'),)}, ), - migrations.RunPython(migrate_service_enabled), + migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop), ] diff --git a/allianceauth/services/modules/market/migrations/0002_service_permissions.py b/allianceauth/services/modules/market/migrations/0002_service_permissions.py index c15a5cad..76861713 100644 --- a/allianceauth/services/modules/market/migrations/0002_service_permissions.py +++ b/allianceauth/services/modules/market/migrations/0002_service_permissions.py @@ -57,5 +57,5 @@ class Migration(migrations.Migration): name='marketuser', options={'permissions': (('access_market', 'Can access the Evernus Market service'),)}, ), - migrations.RunPython(migrate_service_enabled), + migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop), ] diff --git a/allianceauth/services/modules/mumble/migrations/0006_service_permissions.py b/allianceauth/services/modules/mumble/migrations/0006_service_permissions.py index 8e576e17..8b12618c 100644 --- a/allianceauth/services/modules/mumble/migrations/0006_service_permissions.py +++ b/allianceauth/services/modules/mumble/migrations/0006_service_permissions.py @@ -57,5 +57,5 @@ class Migration(migrations.Migration): name='mumbleuser', options={'permissions': (('access_mumble', 'Can access the Mumble service'),)}, ), - migrations.RunPython(migrate_service_enabled), + migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop), ] diff --git a/allianceauth/services/modules/openfire/migrations/0002_service_permissions.py b/allianceauth/services/modules/openfire/migrations/0002_service_permissions.py index 100ad4b0..dc93bf60 100644 --- a/allianceauth/services/modules/openfire/migrations/0002_service_permissions.py +++ b/allianceauth/services/modules/openfire/migrations/0002_service_permissions.py @@ -57,5 +57,5 @@ class Migration(migrations.Migration): name='openfireuser', options={'permissions': (('access_openfire', 'Can access the Openfire service'),)}, ), - migrations.RunPython(migrate_service_enabled), + migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop), ] diff --git a/allianceauth/services/modules/phpbb3/migrations/0002_service_permissions.py b/allianceauth/services/modules/phpbb3/migrations/0002_service_permissions.py index 5cb3106a..c21af40f 100644 --- a/allianceauth/services/modules/phpbb3/migrations/0002_service_permissions.py +++ b/allianceauth/services/modules/phpbb3/migrations/0002_service_permissions.py @@ -57,5 +57,5 @@ class Migration(migrations.Migration): name='phpbb3user', options={'permissions': (('access_phpbb3', 'Can access the phpBB3 service'),)}, ), - migrations.RunPython(migrate_service_enabled), + migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop), ] diff --git a/allianceauth/services/modules/smf/migrations/0002_service_permissions.py b/allianceauth/services/modules/smf/migrations/0002_service_permissions.py index e7557f1d..58f738bd 100644 --- a/allianceauth/services/modules/smf/migrations/0002_service_permissions.py +++ b/allianceauth/services/modules/smf/migrations/0002_service_permissions.py @@ -57,5 +57,5 @@ class Migration(migrations.Migration): name='smfuser', options={'permissions': (('access_smf', 'Can access the SMF service'),)}, ), - migrations.RunPython(migrate_service_enabled), + migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop), ] diff --git a/allianceauth/services/modules/teamspeak3/migrations/0004_service_permissions.py b/allianceauth/services/modules/teamspeak3/migrations/0004_service_permissions.py index 5f8b27db..f9df0184 100644 --- a/allianceauth/services/modules/teamspeak3/migrations/0004_service_permissions.py +++ b/allianceauth/services/modules/teamspeak3/migrations/0004_service_permissions.py @@ -57,5 +57,5 @@ class Migration(migrations.Migration): name='teamspeak3user', options={'permissions': (('access_teamspeak3', 'Can access the Teamspeak3 service'),)}, ), - migrations.RunPython(migrate_service_enabled), + migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop), ] diff --git a/allianceauth/services/modules/xenforo/migrations/0002_service_permissions.py b/allianceauth/services/modules/xenforo/migrations/0002_service_permissions.py index a9b20a5b..313fa6a4 100644 --- a/allianceauth/services/modules/xenforo/migrations/0002_service_permissions.py +++ b/allianceauth/services/modules/xenforo/migrations/0002_service_permissions.py @@ -57,5 +57,5 @@ class Migration(migrations.Migration): name='xenforouser', options={'permissions': (('access_xenforo', 'Can access the XenForo service'),)}, ), - migrations.RunPython(migrate_service_enabled), + migrations.RunPython(migrate_service_enabled, migrations.RunPython.noop), ]