link workspace, categories and usergroups to auth.groups

Author: n0rdlicht

django/gsmap/migrations/0040_workspace_group.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.1.13 on 2022-02-23 17:31
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+        ('gsmap', '0039_auto_20220223_1600'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='workspace',
+            name='group',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='auth.group'),
+        ),
+    ]

django/gsmap/migrations/0041_auto_20220223_1850.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.1.13 on 2022-02-23 18:50
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+        ('gsmap', '0040_workspace_group'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='category',
+            name='group',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='auth.group'),
+        ),
+        migrations.AddField(
+            model_name='usergroup',
+            name='group',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='auth.group'),
+        ),
+    ]

django/gsmap/models.py

@@ -336,13 +336,20 @@ class Meta:
     icon = models.FileField(upload_to='category-icons', null=True, blank=True)
     color = models.CharField(max_length=7, default='#cccccc')
 
+    group = models.ForeignKey(
+        Group, default=None, blank=True,
+        null=True, on_delete=models.SET_NULL
+    )
+
     translations = TranslatedFields(
         name=models.CharField(max_length=255),
     )
     # workspace =  models.ForeignKey(Workspace, on_delete=models.CASCADE)
 
     def __str__(self):
-        return f'{self.namespace}/{self.name}'
+        if self.group:
+            return f'{self.group.name}/{self.name}'
+        return f'{self.name}'
 
 class Usergroup(TranslatableModel):
     class Meta:
@@ -358,14 +365,21 @@ class Meta:
         primary_key=True
     )
 
+    group = models.ForeignKey(
+        Group, default=None, blank=True,
+        null=True, on_delete=models.SET_NULL
+    )
+
     translations = TranslatedFields(
         name=models.CharField(max_length=255),
     )
 
     def __str__(self):
+        if self.group:
+            return f'{self.group.name}/{self.name}'
         return f'{self.name}'
 
-class Workspace(models.Model):
+class Workspace(TranslatableModel):
     class Meta:
         ordering = ['-created']
 
@@ -388,6 +402,11 @@ class Meta:
     ]
     mode = models.CharField(max_length=3, choices=MODE_CHOICES, default="OFF")
 
+    group =models.ForeignKey(
+        Group, default=None, blank=True,
+        null=True, on_delete=models.SET_NULL
+    )
+
     annotations_open = models.BooleanField(default=False, help_text="Enable marker annotations", verbose_name="Marker Annotations enabled")
     annotations_likes_enabled = models.BooleanField(default=True, help_text="Enable like buttons on marker annotations", verbose_name="Marker Likes enabled")
 

django/gsuser/admin.py

@@ -1,6 +1,5 @@
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
 from .models import User
-from graphene import relay
 
-admin.site.register(User, UserAdmin)
+admin.site.register(User, UserAdmin)