Merge branch 'master' of git.imaniti.org:/Tomas/Contract-Registry into test

contracts/admin.py

@@ -277,7 +277,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"]}),

package-lock.json

@@ -853,19 +853,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",

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))