fix inline ordering & permission-based viewing

contracts/admin.py

@@ -272,7 +272,10 @@ class ContractAdmin(
                 "publishing_rejection_comment",
             )
 
-        if request.user.has_perm("approve", self):
+        if (
+            obj is not None
+            and request.user.has_perm("approve", obj)
+        ):
             fieldsets.insert(
                 5,
                 ("Schválení", {"fields": ["is_approved"]}),

shared/templatetags/admin_extras.py

@@ -24,12 +24,16 @@ def get_fieldsets_and_inlines(context):
             else []
         )
     ):
-        if choice == FieldsetInlineOrder.FIELDSET:
-            fieldsets_and_inlines.append(
-                (FieldsetInlineOrder.FIELDSET, next(adminform))
-            )
-        elif choice == FieldsetInlineOrder.INLINE:
-            fieldsets_and_inlines.append((FieldsetInlineOrder.INLINE, next(inlines)))
+        try:
+            if choice == FieldsetInlineOrder.FIELDSET:
+                fieldsets_and_inlines.append(
+                    (FieldsetInlineOrder.FIELDSET, next(adminform))
+                )
+            elif choice == FieldsetInlineOrder.INLINE:
+                fieldsets_and_inlines.append((FieldsetInlineOrder.INLINE, next(inlines)))
+        except StopIteration:
+            # Missing permissions, ignore and move on
+            continue
 
     for fieldset in adminform:
         fieldsets_and_inlines.append((FieldsetInlineOrder.FIELDSET, fieldset))