Merge branch 'release/5.6.2' into 'master'

Release/5.6.2 - master

See merge request os2borgerpc/os2borgerpc-admin-site!281

Author: Søren Howe Gersager

NEWS.rst

@@ -1,3 +1,11 @@
+Version 5.6.2, June 2, 2022
+---------------------------
+
+New in this version:
+
+- Make PCGroup uid unique
+- Make PCGroupAdmin nicer
+
 Version 5.6.1, June 2, 2022
 ---------------------------
 

VERSION

@@ -1 +1 @@
-5.6.1
+5.6.2

admin_site/system/admin.py

@@ -66,7 +66,8 @@ class PCInline(admin.TabularInline):
 
 
 class PCGroupAdmin(admin.ModelAdmin):
-    list_display = ["site", "name"]
+    list_display = ("name", "uid", "site")
+    list_filter = ("site",)
     inlines = [PCInline]
 
 

admin_site/system/migrations/0053_auto_20220602_1522.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2022-06-02 15:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("system", "0052_auto_20220530_1128"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="pcgroup",
+            name="uid",
+            field=models.CharField(max_length=255, unique=True),
+        ),
+    ]

admin_site/system/models.py

@@ -217,7 +217,7 @@ class PCGroup(models.Model):
     """Groups of PCs. Each PC may be in zero or many groups."""
 
     name = models.CharField(verbose_name=_("name"), max_length=255)
-    uid = models.CharField(verbose_name=_("id"), max_length=255)
+    uid = models.CharField(max_length=255, unique=True)
     description = models.TextField(
         verbose_name=_("description"), max_length=1024, blank=True
     )