Refactor for better DRY

Author: fsbraun

filer/admin/fileadmin.py

@@ -60,7 +60,7 @@ class FileAdmin(PrimitivePermissionAwareModelAdmin):
     list_display = ('label',)
     list_per_page = 10
     search_fields = ['name', 'original_filename', 'sha1', 'description']
-    autocomplete_fields = ('owner',)
+    autocomplete_fields = ['owner']
     readonly_fields = ('sha1', 'display_canonical')
 
     form = FileAdminChangeFrom

filer/admin/permissionadmin.py

@@ -22,6 +22,8 @@ class Media:
         css = {'all': ['filer/css/admin_folderpermissions.css']}
 
     def get_autocomplete_fields(self, request):
+        """Remove "owner" from autocomplete_fields is User model has no search_fields"""
+
         autocomplete_fields = super().get_autocomplete_fields(request)
         if django_version >= (5, 0):
             user_admin = self.admin_site.get_model_admin(get_user_model())

filer/admin/permissions.py

@@ -1,8 +1,22 @@
+from django import VERSION as django_version
 from django.contrib import admin
+from django.contrib.auth import get_user_model
 from django.urls import reverse
 
 
 class PrimitivePermissionAwareModelAdmin(admin.ModelAdmin):
+    def get_autocomplete_fields(self, request):
+        """Remove "owner" from autocomplete_fields is User model has no search_fields"""
+
+        autocomplete_fields = super().get_autocomplete_fields(request)
+        if django_version >= (5, 0):
+            user_admin = self.admin_site.get_model_admin(get_user_model())
+        else:
+            user_admin = self.admin_site._registry[get_user_model()]
+        if not user_admin.get_search_fields(request) and 'owner' in autocomplete_fields:
+            autocomplete_fields.remove('owner')
+        return autocomplete_fields
+
     def has_add_permission(self, request):
         # we don't have a "add" permission... but all adding is handled
         # by special methods that go around these permissions anyway