arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

HOTFIX: Supplier admin broken

Browse Source
This commit is contained in:
FreneticScribbler
2022-02-14 16:27:02 +00:00
parent 2dd3d306b4
commit 8799f822bb
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RIGS/admin.py
View File

@@ -113,7 +113,7 @@ class AssociateAdmin(VersionAdmin):
actions = ['merge'] actions = ['merge']
def get_queryset(self, request): 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): def number_of_events(self, obj):
return obj.latest_events.count() return obj.latest_events.count()

4
assets/admin.py
View File

@@ -20,6 +20,10 @@ class AssetStatusAdmin(admin.ModelAdmin):
class SupplierAdmin(AssociateAdmin): class SupplierAdmin(AssociateAdmin):
list_display = ['id', 'name'] list_display = ['id', 'name']
ordering = ['id'] 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) @admin.register(assets.Asset)