fix: Remove user from autocomplete fields if (swapped) user model does not have search fields

Author: fsbraun

filer/admin/permissionadmin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+from django.contrib.auth import get_user_model
 from django.utils.translation import gettext_lazy as _
 
 from .. import settings
@@ -19,6 +20,13 @@ class PermissionAdmin(admin.ModelAdmin):
     class Media:
         css = {'all': ['filer/css/admin_folderpermissions.css']}
 
+    def get_autocomplete_fields(self, request):
+        autocomplete_fields = super().get_autocomplete_fields(request)
+        user_admin = self.admin_site.get_model_admin(get_user_model())
+        if not user_admin.get_search_fields(request):
+            autocomplete_fields.remove('user')
+        return autocomplete_fields
+
     def get_queryset(self, request):
         qs = super().get_queryset(request)
         return qs.prefetch_related("group", "folder")

filer/templates/admin/filer/widgets/admin_file.html

@@ -26,7 +26,7 @@
         <span class="filerFile js-file-selector">
             {% if object %}
                 {% if object.file.exists %}
-                    <a href="{{ object.url }}" target="_blank">{% file_icon object detail=True %}</a>
+                    <a href="{{ object.url }}" target="_blank">{% file_icon object detail="table" %}</a>
                     &nbsp;<span class="description_text">{{ object.label }}</span>
                 {% else %}
                     {% file_icon object %}

filer/validation.py

@@ -91,6 +91,19 @@ def sanitize_svg(file_name: str, file: typing.IO, owner: User, mime_type: str) -
     file.write(xml)  # write to binary file with utf-8 encoding
 
 
+def validate_octet(file_name: str, file: typing.IO, owner: User, mime_type: str) -> None:
+    """Octet streams are binary files without a specific mime type. They are run through
+    a virus check."""
+    try:
+        from django_clamd.validators import validate_file_infection
+
+        validate_file_infection(file)
+    except (ModuleNotFoundError, ImportError):
+        raise FileValidationError(
+            _('File "{file_name}": Virus check for binary/unknown file not available').format(file_name=file_name)
+        )
+
+
 def validate_upload(file_name: str, file: typing.IO, owner: User, mime_type: str) -> None:
     """Actual validation: Call all validators for the given mime type. The app config reads
     the validators from the settings and replaces dotted paths by callables."""