diff --git a/RIGS/admin.py b/RIGS/admin.py index 6e6fdb71..a46a0eee 100644 --- a/RIGS/admin.py +++ b/RIGS/admin.py @@ -113,7 +113,7 @@ class AssociateAdmin(VersionAdmin): actions = ['merge'] def get_queryset(self, request): - return super(AssociateAdmin, self).get_queryset(request).annotate(event_count=Count('event')) + return super().get_queryset(request).annotate(event_count=Count('event')) def number_of_events(self, obj): return obj.latest_events.count() diff --git a/assets/admin.py b/assets/admin.py index 06bf0e70..51b548bb 100644 --- a/assets/admin.py +++ b/assets/admin.py @@ -20,6 +20,10 @@ class AssetStatusAdmin(admin.ModelAdmin): class SupplierAdmin(AssociateAdmin): list_display = ['id', 'name'] ordering = ['id'] + merge_fields = ['name', 'phone', 'email', 'address', 'notes'] + + def get_queryset(self, request): + return super(VersionAdmin, self).get_queryset(request) @admin.register(assets.Asset)