From acfd34644015db5e5d0ee92c381b09035f6401fd Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Fri, 17 May 2024 20:11:31 -0700 Subject: [PATCH] make abids searchable in the admin ui --- archivebox/core/admin.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/archivebox/core/admin.py b/archivebox/core/admin.py index 15822478..1744c593 100644 --- a/archivebox/core/admin.py +++ b/archivebox/core/admin.py @@ -192,7 +192,7 @@ class SnapshotAdmin(SearchResultsAdminMixin, admin.ModelAdmin): list_display = ('added', 'title_str', 'files', 'size', 'url_str') sort_fields = ('title_str', 'url_str', 'added', 'files') readonly_fields = ('admin_actions', 'status_info', 'bookmarked', 'added', 'updated', 'created', 'modified', 'identifiers') - search_fields = ('id', 'url', 'timestamp', 'title', 'tags__name') + search_fields = ('id', 'url', 'abid', 'uuid', 'timestamp', 'title', 'tags__name') fields = ('url', 'timestamp', 'created_by', 'tags', 'title', *readonly_fields) list_filter = ('added', 'updated', 'tags', 'archiveresult__status', 'created_by') ordering = ['-added'] @@ -247,9 +247,9 @@ class SnapshotAdmin(SearchResultsAdminMixin, admin.ModelAdmin): return format_html( # URL Hash: {}
''' - Summary page ➡️     - Result files 📑     - Admin actions ⚙️ + Summary page ➡️     + Result files 📑     + Admin actions ⚙️ ''', obj.timestamp, obj.timestamp, @@ -269,12 +269,12 @@ class SnapshotAdmin(SearchResultsAdminMixin, admin.ModelAdmin): ''', '✅' if obj.is_archived else '❌', obj.num_outputs, - self.size(obj), + self.size(obj) or '0kb', f'/archive/{obj.timestamp}/favicon.ico', - obj.status_code or '?', - obj.headers and obj.headers.get('Server') or '?', - obj.headers and obj.headers.get('Content-Type') or '?', - obj.extension or '?', + obj.status_code or '-', + obj.headers and obj.headers.get('Server') or '-', + obj.headers and obj.headers.get('Content-Type') or '-', + obj.extension or '-', ) def identifiers(self, obj): @@ -479,7 +479,7 @@ class ArchiveResultAdmin(admin.ModelAdmin): list_display = ('start_ts', 'snapshot_info', 'tags_str', 'extractor', 'cmd_str', 'status', 'output_str') sort_fields = ('start_ts', 'extractor', 'status') readonly_fields = ('snapshot_info', 'tags_str', 'created_by', 'created', 'modified', 'identifiers') - search_fields = ('id', 'uuid', 'snapshot__url', 'extractor', 'output', 'cmd_version', 'cmd', 'snapshot__timestamp') + search_fields = ('id', 'uuid', 'abid', 'snapshot__url', 'extractor', 'output', 'cmd_version', 'cmd', 'snapshot__timestamp') fields = ('snapshot', 'extractor', 'status', 'output', 'pwd', 'cmd', 'start_ts', 'end_ts', 'cmd_version', *readonly_fields) autocomplete_fields = ['snapshot']