novaburst/funquail
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed obsolete permissions, added a new moderation permission

Browse source
This commit is contained in:
Eliot Berriot 2018-12-06 11:18:09 +01:00
commit 34ec869ca1
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
9 changed files with 60 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

5
api/funkwhale_api/users/admin.py
View file

@ -51,7 +51,7 @@ class UserAdmin(AuthUserAdmin):
"privacy_level",
"permission_settings",
"permission_library",
"permission_federation",
"permission_moderation",
]
fieldsets = (
@ -67,10 +67,9 @@ class UserAdmin(AuthUserAdmin):
"is_active",
"is_staff",
"is_superuser",
"permission_upload",
"permission_library",
"permission_settings",
"permission_federation",
"permission_moderation",
)
},
),

26
api/funkwhale_api/users/migrations/0013_auto_20181206_1008.py Normal file
View file

@ -0,0 +1,26 @@
# Generated by Django 2.0.9 on 2018-12-06 10:08
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('users', '0012_user_upload_quota'),
]
operations = [
migrations.RemoveField(
model_name='user',
name='permission_federation',
),
migrations.RemoveField(
model_name='user',
name='permission_upload',
),
migrations.AddField(
model_name='user',
name='permission_moderation',
field=models.BooleanField(default=False, help_text='Block/mute/remove domains, users and content', verbose_name='Moderation'),
),
]

18
api/funkwhale_api/users/models.py
View file

@ -34,16 +34,15 @@ def get_token():
PERMISSIONS_CONFIGURATION = {
"federation": {
"label": "Manage library federation",
"help_text": "Follow other instances, accept/deny library follow requests...",
"moderation": {
"label": "Moderation",
"help_text": "Block/mute/remove domains, users and content",
},
"library": {
"label": "Manage library",
"help_text": "Manage library, delete files, tracks, artists, albums...",
},
"settings": {"label": "Manage instance-level settings", "help_text": ""},
"upload": {"label": "Upload new content to the library", "help_text": ""},
}
PERMISSIONS = sorted(PERMISSIONS_CONFIGURATION.keys())
@ -71,9 +70,9 @@ class User(AbstractUser):
subsonic_api_token = models.CharField(blank=True, null=True, max_length=255)
# permissions
permission_federation = models.BooleanField(
PERMISSIONS_CONFIGURATION["federation"]["label"],
help_text=PERMISSIONS_CONFIGURATION["federation"]["help_text"],
permission_moderation = models.BooleanField(
PERMISSIONS_CONFIGURATION["moderation"]["label"],
help_text=PERMISSIONS_CONFIGURATION["moderation"]["help_text"],
default=False,
)
permission_library = models.BooleanField(
@ -86,11 +85,6 @@ class User(AbstractUser):
help_text=PERMISSIONS_CONFIGURATION["settings"]["help_text"],
default=False,
)
permission_upload = models.BooleanField(
PERMISSIONS_CONFIGURATION["upload"]["label"],
help_text=PERMISSIONS_CONFIGURATION["upload"]["help_text"],
default=False,
)
last_activity = models.DateTimeField(default=None, null=True, blank=True)