From 075d0650b04a9d08e3df46c331acda8dcc8d58e3 Mon Sep 17 00:00:00 2001 From: Joel Falknau Date: Wed, 5 Mar 2025 14:33:37 +1000 Subject: [PATCH] Drop default permissions for when we have defined perms --- .../migrations/0009_alter_fatlink_options.py | 17 +++++++++++++++++ allianceauth/fleetactivitytracking/models.py | 2 -- .../0007_alter_notification_options.py | 17 +++++++++++++++++ allianceauth/notifications/models.py | 1 - .../0005_alter_discorduser_options.py | 17 +++++++++++++++++ allianceauth/services/modules/discord/models.py | 1 + .../0004_alter_discourseuser_options.py | 17 +++++++++++++++++ .../services/modules/discourse/models.py | 1 + .../migrations/0004_alter_ips4user_options.py | 17 +++++++++++++++++ allianceauth/services/modules/ips4/models.py | 1 + .../migrations/0016_alter_mumbleuser_options.py | 17 +++++++++++++++++ allianceauth/services/modules/mumble/models.py | 1 + .../0004_alter_openfireuser_options.py | 17 +++++++++++++++++ .../migrations/0004_alter_phpbb3user_options.py | 17 +++++++++++++++++ allianceauth/services/modules/phpbb3/models.py | 1 + .../migrations/0005_alter_smfuser_options.py | 17 +++++++++++++++++ allianceauth/services/modules/smf/models.py | 1 + .../0007_alter_teamspeak3user_options.py | 17 +++++++++++++++++ .../services/modules/teamspeak3/models.py | 1 + .../0004_alter_xenforouser_options.py | 17 +++++++++++++++++ allianceauth/services/modules/xenforo/models.py | 1 + 21 files changed, 195 insertions(+), 3 deletions(-) create mode 100644 allianceauth/fleetactivitytracking/migrations/0009_alter_fatlink_options.py create mode 100644 allianceauth/notifications/migrations/0007_alter_notification_options.py create mode 100644 allianceauth/services/modules/discord/migrations/0005_alter_discorduser_options.py create mode 100644 allianceauth/services/modules/discourse/migrations/0004_alter_discourseuser_options.py create mode 100644 allianceauth/services/modules/ips4/migrations/0004_alter_ips4user_options.py create mode 100644 allianceauth/services/modules/mumble/migrations/0016_alter_mumbleuser_options.py create mode 100644 allianceauth/services/modules/openfire/migrations/0004_alter_openfireuser_options.py create mode 100644 allianceauth/services/modules/phpbb3/migrations/0004_alter_phpbb3user_options.py create mode 100644 allianceauth/services/modules/smf/migrations/0005_alter_smfuser_options.py create mode 100644 allianceauth/services/modules/teamspeak3/migrations/0007_alter_teamspeak3user_options.py create mode 100644 allianceauth/services/modules/xenforo/migrations/0004_alter_xenforouser_options.py diff --git a/allianceauth/fleetactivitytracking/migrations/0009_alter_fatlink_options.py b/allianceauth/fleetactivitytracking/migrations/0009_alter_fatlink_options.py new file mode 100644 index 00000000..4937e2a2 --- /dev/null +++ b/allianceauth/fleetactivitytracking/migrations/0009_alter_fatlink_options.py @@ -0,0 +1,17 @@ +# Generated by Django 5.1.6 on 2025-03-05 04:28 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('fleetactivitytracking', '0008_v5squash'), + ] + + operations = [ + migrations.AlterModelOptions( + name='fatlink', + options={'permissions': ()}, + ), + ] diff --git a/allianceauth/fleetactivitytracking/models.py b/allianceauth/fleetactivitytracking/models.py index 62b474b8..eb2a5d36 100644 --- a/allianceauth/fleetactivitytracking/models.py +++ b/allianceauth/fleetactivitytracking/models.py @@ -14,7 +14,6 @@ class Fatlink(models.Model): creator = models.ForeignKey(User, on_delete=models.SET(get_sentinel_user)) class Meta: - default_permissions = () permissions = ( # Intentionally Commented out # AAv0 has these in the Auth_ Content Type @@ -35,7 +34,6 @@ class Fat(models.Model): user = models.ForeignKey(User, on_delete=models.CASCADE) class Meta: - default_permissions = () unique_together = (("character", "fatlink"),) def __str__(self) -> str: diff --git a/allianceauth/notifications/migrations/0007_alter_notification_options.py b/allianceauth/notifications/migrations/0007_alter_notification_options.py new file mode 100644 index 00000000..f39da857 --- /dev/null +++ b/allianceauth/notifications/migrations/0007_alter_notification_options.py @@ -0,0 +1,17 @@ +# Generated by Django 5.1.6 on 2025-03-05 04:28 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('notifications', '0006_v5squash'), + ] + + operations = [ + migrations.AlterModelOptions( + name='notification', + options={'permissions': ()}, + ), + ] diff --git a/allianceauth/notifications/models.py b/allianceauth/notifications/models.py index 51e06401..21e38ee0 100644 --- a/allianceauth/notifications/models.py +++ b/allianceauth/notifications/models.py @@ -59,7 +59,6 @@ class Notification(models.Model): objects = NotificationManager() class Meta: - default_permissions = () permissions = ( # Intentionally Commented out # AAv0 has these in the Auth_ Content Type diff --git a/allianceauth/services/modules/discord/migrations/0005_alter_discorduser_options.py b/allianceauth/services/modules/discord/migrations/0005_alter_discorduser_options.py new file mode 100644 index 00000000..8ae169e2 --- /dev/null +++ b/allianceauth/services/modules/discord/migrations/0005_alter_discorduser_options.py @@ -0,0 +1,17 @@ +# Generated by Django 5.1.6 on 2025-03-05 04:26 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('discord', '0004_v5squash'), + ] + + operations = [ + migrations.AlterModelOptions( + name='discorduser', + options={'default_permissions': (), 'permissions': (('access_discord', 'Can access the Discord service'),)}, + ), + ] diff --git a/allianceauth/services/modules/discord/models.py b/allianceauth/services/modules/discord/models.py index 73d398c2..40a49432 100644 --- a/allianceauth/services/modules/discord/models.py +++ b/allianceauth/services/modules/discord/models.py @@ -40,6 +40,7 @@ class DiscordUser(models.Model): objects = DiscordUserManager() class Meta: + default_permissions = () permissions = (("access_discord", "Can access the Discord service"),) def __str__(self) -> str: diff --git a/allianceauth/services/modules/discourse/migrations/0004_alter_discourseuser_options.py b/allianceauth/services/modules/discourse/migrations/0004_alter_discourseuser_options.py new file mode 100644 index 00000000..66fc4521 --- /dev/null +++ b/allianceauth/services/modules/discourse/migrations/0004_alter_discourseuser_options.py @@ -0,0 +1,17 @@ +# Generated by Django 5.1.6 on 2025-03-05 04:26 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('discourse', '0003_v5squash'), + ] + + operations = [ + migrations.AlterModelOptions( + name='discourseuser', + options={'default_permissions': (), 'permissions': (('access_discourse', 'Can access the Discourse service'),)}, + ), + ] diff --git a/allianceauth/services/modules/discourse/models.py b/allianceauth/services/modules/discourse/models.py index 9d015044..3511259e 100644 --- a/allianceauth/services/modules/discourse/models.py +++ b/allianceauth/services/modules/discourse/models.py @@ -7,6 +7,7 @@ class DiscourseUser(models.Model): enabled = models.BooleanField() class Meta: + default_permissions = () permissions = (("access_discourse", "Can access the Discourse service"),) def __str__(self) -> str: diff --git a/allianceauth/services/modules/ips4/migrations/0004_alter_ips4user_options.py b/allianceauth/services/modules/ips4/migrations/0004_alter_ips4user_options.py new file mode 100644 index 00000000..f61c02ce --- /dev/null +++ b/allianceauth/services/modules/ips4/migrations/0004_alter_ips4user_options.py @@ -0,0 +1,17 @@ +# Generated by Django 5.1.6 on 2025-03-05 04:26 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('ips4', '0003_v5squash'), + ] + + operations = [ + migrations.AlterModelOptions( + name='ips4user', + options={'default_permissions': (), 'permissions': (('access_ips4', 'Can access the IPS4 service'),)}, + ), + ] diff --git a/allianceauth/services/modules/ips4/models.py b/allianceauth/services/modules/ips4/models.py index d1a46bbf..2d17a050 100644 --- a/allianceauth/services/modules/ips4/models.py +++ b/allianceauth/services/modules/ips4/models.py @@ -8,6 +8,7 @@ class Ips4User(models.Model): id = models.CharField(max_length=254) class Meta: + default_permissions = () permissions = (("access_ips4", "Can access the IPS4 service"),) def __str__(self) -> str: diff --git a/allianceauth/services/modules/mumble/migrations/0016_alter_mumbleuser_options.py b/allianceauth/services/modules/mumble/migrations/0016_alter_mumbleuser_options.py new file mode 100644 index 00000000..28831bdc --- /dev/null +++ b/allianceauth/services/modules/mumble/migrations/0016_alter_mumbleuser_options.py @@ -0,0 +1,17 @@ +# Generated by Django 5.1.6 on 2025-03-05 04:26 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('mumble', '0015_v5squash'), + ] + + operations = [ + migrations.AlterModelOptions( + name='mumbleuser', + options={'default_permissions': (), 'permissions': (('access_mumble', 'Can access the Mumble service'), ('view_connection_history', 'Can access the connection history of the Mumble service'))}, + ), + ] diff --git a/allianceauth/services/modules/mumble/models.py b/allianceauth/services/modules/mumble/models.py index 90c28b81..49e36f24 100644 --- a/allianceauth/services/modules/mumble/models.py +++ b/allianceauth/services/modules/mumble/models.py @@ -152,6 +152,7 @@ class MumbleUser(AbstractServiceModel): return True class Meta: + default_permissions = () permissions = ( ("access_mumble", "Can access the Mumble service"), ("view_connection_history", "Can access the connection history of the Mumble service"), diff --git a/allianceauth/services/modules/openfire/migrations/0004_alter_openfireuser_options.py b/allianceauth/services/modules/openfire/migrations/0004_alter_openfireuser_options.py new file mode 100644 index 00000000..70230ea6 --- /dev/null +++ b/allianceauth/services/modules/openfire/migrations/0004_alter_openfireuser_options.py @@ -0,0 +1,17 @@ +# Generated by Django 5.1.6 on 2025-03-05 04:23 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('openfire', '0003_v5squash'), + ] + + operations = [ + migrations.AlterModelOptions( + name='openfireuser', + options={'default_permissions': (), 'permissions': (('access_openfire', 'Can access the Openfire service'),)}, + ), + ] diff --git a/allianceauth/services/modules/phpbb3/migrations/0004_alter_phpbb3user_options.py b/allianceauth/services/modules/phpbb3/migrations/0004_alter_phpbb3user_options.py new file mode 100644 index 00000000..8d2ecd53 --- /dev/null +++ b/allianceauth/services/modules/phpbb3/migrations/0004_alter_phpbb3user_options.py @@ -0,0 +1,17 @@ +# Generated by Django 5.1.6 on 2025-03-05 04:26 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('phpbb3', '0003_v5squash'), + ] + + operations = [ + migrations.AlterModelOptions( + name='phpbb3user', + options={'default_permissions': (), 'permissions': (('access_phpbb3', 'Can access the phpBB3 service'),)}, + ), + ] diff --git a/allianceauth/services/modules/phpbb3/models.py b/allianceauth/services/modules/phpbb3/models.py index 1f320bab..57a32ae0 100644 --- a/allianceauth/services/modules/phpbb3/models.py +++ b/allianceauth/services/modules/phpbb3/models.py @@ -6,6 +6,7 @@ class Phpbb3User(models.Model): username = models.CharField(max_length=254) class Meta: + default_permissions = () permissions = (("access_phpbb3", "Can access the phpBB3 service"),) def __str__(self) -> str: diff --git a/allianceauth/services/modules/smf/migrations/0005_alter_smfuser_options.py b/allianceauth/services/modules/smf/migrations/0005_alter_smfuser_options.py new file mode 100644 index 00000000..3ed1d404 --- /dev/null +++ b/allianceauth/services/modules/smf/migrations/0005_alter_smfuser_options.py @@ -0,0 +1,17 @@ +# Generated by Django 5.1.6 on 2025-03-05 04:26 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('smf', '0004_v5squash'), + ] + + operations = [ + migrations.AlterModelOptions( + name='smfuser', + options={'default_permissions': (), 'permissions': (('access_smf', 'Can access the SMF service'),)}, + ), + ] diff --git a/allianceauth/services/modules/smf/models.py b/allianceauth/services/modules/smf/models.py index 0ffc1bc8..a8ed1ec8 100644 --- a/allianceauth/services/modules/smf/models.py +++ b/allianceauth/services/modules/smf/models.py @@ -6,6 +6,7 @@ class SmfUser(models.Model): username = models.CharField(max_length=254) class Meta: + default_permissions = () permissions = (("access_smf", "Can access the SMF service"),) def __str__(self) -> str: diff --git a/allianceauth/services/modules/teamspeak3/migrations/0007_alter_teamspeak3user_options.py b/allianceauth/services/modules/teamspeak3/migrations/0007_alter_teamspeak3user_options.py new file mode 100644 index 00000000..c6bf36b9 --- /dev/null +++ b/allianceauth/services/modules/teamspeak3/migrations/0007_alter_teamspeak3user_options.py @@ -0,0 +1,17 @@ +# Generated by Django 5.1.6 on 2025-03-05 04:26 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teamspeak3', '0006_v5squash'), + ] + + operations = [ + migrations.AlterModelOptions( + name='teamspeak3user', + options={'default_permissions': (), 'permissions': (('access_teamspeak3', 'Can access the Teamspeak3 service'),)}, + ), + ] diff --git a/allianceauth/services/modules/teamspeak3/models.py b/allianceauth/services/modules/teamspeak3/models.py index 5e424af5..5b685c9e 100644 --- a/allianceauth/services/modules/teamspeak3/models.py +++ b/allianceauth/services/modules/teamspeak3/models.py @@ -10,6 +10,7 @@ class Teamspeak3User(models.Model): perm_key = models.CharField(max_length=254) class Meta: + default_permissions = () permissions = (("access_teamspeak3", "Can access the Teamspeak3 service"),) def __str__(self) -> str: diff --git a/allianceauth/services/modules/xenforo/migrations/0004_alter_xenforouser_options.py b/allianceauth/services/modules/xenforo/migrations/0004_alter_xenforouser_options.py new file mode 100644 index 00000000..9d978d07 --- /dev/null +++ b/allianceauth/services/modules/xenforo/migrations/0004_alter_xenforouser_options.py @@ -0,0 +1,17 @@ +# Generated by Django 5.1.6 on 2025-03-05 04:26 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('xenforo', '0003_v5squash'), + ] + + operations = [ + migrations.AlterModelOptions( + name='xenforouser', + options={'default_permissions': (), 'permissions': (('access_xenforo', 'Can access the XenForo service'),)}, + ), + ] diff --git a/allianceauth/services/modules/xenforo/models.py b/allianceauth/services/modules/xenforo/models.py index d254ffa8..b4514b8b 100644 --- a/allianceauth/services/modules/xenforo/models.py +++ b/allianceauth/services/modules/xenforo/models.py @@ -6,6 +6,7 @@ class XenforoUser(models.Model): username = models.CharField(max_length=254) class Meta: + default_permissions = () permissions = (("access_xenforo", "Can access the XenForo service"),) def __str__(self) -> str: