fix(users): Refactor object permission query logic

Simplifies the `OBJECTPERMISSION_OBJECT_TYPES` definition by adjusting
query filters and introducing new conditions for specific app labels
and models.

Fixes #21051

netbox/extras/forms/model_forms.py

@@ -22,7 +22,7 @@ from utilities.forms.fields import (
     DynamicModelMultipleChoiceField, JSONField, SlugField,
 )
 from utilities.forms.rendering import FieldSet, ObjectAttribute
-from utilities.forms.widgets import ChoicesWidget, ClearableFileInput, HTMXSelect
+from utilities.forms.widgets import ChoicesWidget, HTMXSelect
 from utilities.tables import get_table_for_model
 from virtualization.models import Cluster, ClusterGroup, ClusterType
 
@@ -784,10 +784,6 @@ class ImageAttachmentForm(forms.ModelForm):
         fields = [
             'image', 'name', 'description',
         ]
-        # Explicitly set 'image/avif' to support AVIF selection in Firefox
-        widgets = {
-            'image': ClearableFileInput(attrs={'accept': 'image/*,image/avif'}),
-        }
         help_texts = {
             'name': _("If no name is specified, the file name will be used.")
         }

netbox/extras/utils.py

@@ -78,7 +78,7 @@ def image_upload(instance, filename):
     """
     upload_dir = 'image-attachments'
     default_filename = 'unnamed'
-    allowed_img_extensions = ('avif', 'bmp', 'gif', 'jpeg', 'jpg', 'png', 'webp')
+    allowed_img_extensions = ('bmp', 'gif', 'jpeg', 'jpg', 'png', 'webp')
 
     # Normalize Windows paths and create a Path object.
     normalized_filename = str(filename).replace('\\', '/')

netbox/users/constants.py

@@ -3,9 +3,10 @@ import string
 from django.db.models import Q
 
 
-OBJECTPERMISSION_OBJECT_TYPES = Q(
-    ~Q(app_label__in=['account', 'admin', 'auth', 'contenttypes', 'sessions', 'taggit', 'users']) |
-    Q(app_label='users', model__in=['objectpermission', 'token', 'group', 'user', 'owner'])
+OBJECTPERMISSION_OBJECT_TYPES = (
+    (Q(public=True) & ~Q(app_label='core', model='objecttype'))
+    | Q(app_label='core', model__in=['managedfile'])
+    | Q(app_label='extras', model__in=['scriptmodule', 'taggeditem'])
 )
 
 CONSTRAINT_TOKEN_USER = '$user'