Add flag locally_managed for roles and groups

ESSArch_Core/auth/admin.py

@@ -14,6 +14,7 @@
 from django.db.models import Q
 from django.db.models.functions import Lower
 from django.utils.decorators import method_decorator
+from django.utils.html import format_html
 from django.utils.text import capfirst
 from django.utils.translation import gettext_lazy as _
 from django.views.decorators.csrf import csrf_protect
@@ -25,13 +26,18 @@
     GroupType as GroupManagerGroupType,
     Member as GroupManagerMember,
 )
-from nested_inline.admin import NestedModelAdmin, NestedTabularInline
+from nested_inline.admin import (
+    NestedModelAdmin,
+    NestedStackedInline,
+    NestedTabularInline,
+)
 
 from ESSArch_Core.admin import NestedStackedInlineWithoutHeader
 from ESSArch_Core.auth.models import (
     Group,
     GroupMember,
     GroupMemberRole,
+    GroupMemberRoleAssignment,
     GroupType,
     Member,
     ProxyGroup,
@@ -65,21 +71,85 @@ class GroupMemberForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields['expiration_date'].required = False
-        self.fields['roles'].required = False
-        self.fields['group'].disabled = True
 
     class Meta:
         model = GroupMember
-        fields = '__all__'
+        # fields = '__all__'
+        fields = [
+            # 'group',
+            'member',
+            'expiration_date',
+            'is_locally_managed',
+        ]
+
+
+class GroupMemberRoleAssignmentForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['expiration_date'].required = False
+
+    class Meta:
+        model = GroupMemberRoleAssignment
+        fields = [
+            'role',
+            'expiration_date',
+            'is_locally_managed',
+        ]
+
+
+class GroupMemberRoleAssignmentInline(NestedTabularInline):
+    model = GroupMemberRoleAssignment
+    form = GroupMemberRoleAssignmentForm
+    extra = 0
+    fields = [
+        'role',
+        'expiration_date',
+        'is_locally_managed',
+    ]
+    verbose_name = _('role')
+    verbose_name_plural = _('roles')
+
+    def has_add_permission(self, request, obj=None):
+        return True
+
+    def has_change_permission(self, request, obj=None):
+        return True
+
+    def has_delete_permission(self, request, obj=None):
+        return True
 
 
-class GroupMemberInline(NestedTabularInline):
+class GroupMemberInline(NestedStackedInline):
     form = GroupMemberForm
-    filter_horizontal = ['roles']
-    fields = ['group', 'member', 'expiration_date', 'roles']
     model = GroupMember
     extra = 0
-    verbose_name_plural = _('Assigned roles')
+    fields = [
+        'group_heading',
+        'expiration_date',
+        'is_locally_managed',
+    ]
+
+    readonly_fields = ['group_heading']
+    inlines = [GroupMemberRoleAssignmentInline]
+
+    verbose_name = _('Group membership')
+    verbose_name_plural = _('Group memberships')
+
+    class Media:
+        css = {
+            'all': ('essauth/css/admin.css',)
+        }
+
+    def group_heading(self, obj):
+        if not obj.pk:
+            return ''
+
+        return format_html(
+            '<div class="group-membership-heading">{}</div>',
+            obj.group.name,
+        )
+
+    group_heading.short_description = _('Group')
 
     def has_add_permission(self, request, obj=None):
         return False

ESSArch_Core/auth/locale/sv/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-14 16:48+0200\n"
+"POT-Creation-Date: 2026-08-19 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,136 +18,154 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: auth/admin.py:81
-msgid "Assigned roles"
-msgstr "Tilldelade roller"
+#: admin.py:110 models.py:179
+msgid "role"
+msgstr "roll"
+
+#: admin.py:111 models.py:180 models.py:435
+msgid "roles"
+msgstr "roller"
+
+#: admin.py:142
+msgid "Group membership"
+msgstr "Gruppmedlemskap"
+
+#: admin.py:143
+msgid "Group memberships"
+msgstr "Gruppmedlemskap"
+
+#: admin.py:166
+#, fuzzy
+#| msgid "Groups"
+msgid "Group"
+msgstr "Grupper"
 
-#: auth/admin.py:103
+#: admin.py:188
 msgid "Groups added above appears here when saving"
 msgstr "Grupper tillagda ovan visas här efter de har sparats"
 
-#: auth/admin.py:122
+#: admin.py:207
 msgid "Personal info"
 msgstr "Personlig info"
 
-#: auth/admin.py:123
+#: admin.py:208
 msgid "Permissions"
 msgstr "Behörigheter"
 
-#: auth/admin.py:125
+#: admin.py:210
 msgid "Important dates"
 msgstr "Viktiga datum"
 
-#: auth/admin.py:126
+#: admin.py:211
 msgid "Groups"
 msgstr "Grupper"
 
-#: auth/admin.py:226 auth/models.py:280 auth/models.py:288
+#: admin.py:315 models.py:272 models.py:280
 msgid "group type"
 msgstr "grupptyp"
 
-#: auth/admin.py:230 auth/models.py:295
+#: admin.py:319 models.py:287
 msgid "parent"
 msgstr "överordnad"
 
-#: auth/admin.py:309
+#: admin.py:323 models.py:175 models.py:288
+msgid "external id"
+msgstr "externt id"
+
+#: admin.py:363 models.py:173
+msgid "name"
+msgstr "namn"
+
+#: admin.py:391
+msgid "Duplicate selected items"
+msgstr "Duplicera valda objekt"
+
+#: admin.py:437
 msgid "content type"
 msgstr ""
 
-#: auth/apps.py:7
+#: apps.py:7
 msgid "Authentication and Authorization"
 msgstr ""
 
-#: auth/models.py:173
-msgid "name"
-msgstr "namn"
-
-#: auth/models.py:174
-msgid "label"
-msgstr "etikett"
-
-#: auth/models.py:175 auth/models.py:248
+#: models.py:174 models.py:240
 msgid "permissions"
 msgstr "behörigheter"
 
-#: auth/models.py:176 auth/models.py:296
-msgid "external id"
-msgstr "externt id"
-
-#: auth/models.py:187
-msgid "role"
-msgstr "roll"
-
-#: auth/models.py:188 auth/models.py:428
-msgid "roles"
-msgstr "roller"
+#: models.py:176
+msgid "codename"
+msgstr "namn"
 
-#: auth/models.py:231 auth/models.py:407 auth/models.py:420
+#: models.py:223 models.py:410 models.py:423
 msgid "group"
 msgstr "grupp"
 
-#: auth/models.py:232 auth/models.py:408
+#: models.py:224 models.py:411
 msgid "groups"
 msgstr "grupper"
 
-#: auth/models.py:239
+#: models.py:231
 msgid "user"
 msgstr "användare"
 
-#: auth/models.py:240
+#: models.py:232
 msgid "users"
 msgstr "användare"
 
-#: auth/models.py:247
+#: models.py:239
 msgid "permission"
 msgstr ""
 
-#: auth/models.py:281
+#: models.py:273
 msgid "group types"
 msgstr "grupptyper"
 
-#: auth/models.py:297
+#: models.py:289
 msgid "properties"
 msgstr ""
 
-#: auth/models.py:426
+#: models.py:429
 msgid "member"
 msgstr ""
 
-#: auth/models.py:429
+#: models.py:437 models.py:460
 msgid "expiration date"
 msgstr "utgångsdatum"
 
-#: auth/serializers.py:246
+#: models.py:438 models.py:461
+msgid "locally managed"
+msgstr "hanteras lokalt"
+
+#: serializers.py:286
 msgid "User account is disabled"
 msgstr "Användaren är inaktiverad"
 
-#: auth/serializers.py:249
+#: serializers.py:289
 msgid "Invalid username or password"
 msgstr "Felaktigt användarnamn eller lösenord"
 
-#: auth/serializers.py:258
+#: serializers.py:298
 msgid "E-mail is not verified."
 msgstr "E-postadressen är inte verifierad"
 
-#: auth/templates/essauth/admin/group/add_form.html:6
+#: templates/essauth/admin/group/add_form.html:6
 msgid ""
 "First, enter a name and optionally some permissions. Then, you'll be able to "
 "edit more group options."
 msgstr ""
 "Ange först ett namn och eventuella rättigheter. Efter det kommer du att få "
 "fler gruppalternativ."
 
-#: auth/templates/essauth/admin/group/add_form.html:8
+#: templates/essauth/admin/group/add_form.html:8
 msgid "Enter a name."
 msgstr "Ange ett namn."
 
-#: auth/templates/essauth/admin/user/add_form.html:6
+#: templates/essauth/admin/user/add_form.html:6
 msgid ""
 "First, enter a username and password. Then, you'll be able to edit more user "
 "options."
 msgstr ""
 
-#: auth/templates/essauth/admin/user/add_form.html:8
+#: templates/essauth/admin/user/add_form.html:8
 msgid "Enter a username and password."
 msgstr "Ange användarnamn och lösenord"