Merge 1f64986 into 01f9bc0

CHANGES.rst

@@ -5,7 +5,9 @@ Changelog of lizard-auth-client
 3.0.3 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Removed functionality to export objects in admin panel.
+
+- Fixed search functionality in UserOrganisationRole admin panel.
 
 
 3.0.2 (2020-06-19)

lizard_auth_client/admin.py

@@ -2,24 +2,23 @@
 from __future__ import unicode_literals
 from django.contrib import admin
 from lizard_auth_client import models
-from import_export.admin import ExportActionModelAdmin
 
 
 @admin.register(models.Role)
-class RoleAdmin(ExportActionModelAdmin, admin.ModelAdmin):
+class RoleAdmin(admin.ModelAdmin):
     list_display = ('name', 'code', 'unique_id')
     search_fields = ('name', 'code', 'unique_id')
 
 
 @admin.register(models.Organisation)
-class OrganisationAdmin(ExportActionModelAdmin, admin.ModelAdmin):
+class OrganisationAdmin(admin.ModelAdmin):
     list_display = ('name', 'unique_id')
     search_fields = ('name', 'unique_id')
 
 
 @admin.register(models.UserOrganisationRole)
-class UserOrganisationRoleAdmin(ExportActionModelAdmin, admin.ModelAdmin):
+class UserOrganisationRoleAdmin(admin.ModelAdmin):
     list_display = ('user', 'organisation', 'role')
-    search_fields = ('user', 'organisation', 'role')
-    list_filter = ('organisation', 'role')
+    search_fields = ('user__username', 'organisation__name')
+    list_filter = ('role', 'organisation')
     list_display_links = ('user', 'organisation', 'role')

setup.py

@@ -16,7 +16,6 @@
     'requests',
     'PyJWT',
     'django-crispy-forms',
-    'django-import-export',
 ],
 
 tests_require = [