From 796f9ada3c1ac010ec5e1f79091a866aec099af9 Mon Sep 17 00:00:00 2001 From: Kyle McCormick Date: Fri, 23 Aug 2019 14:45:49 -0400 Subject: [PATCH 1/5] Improve list display for model admin --- user_tasks/__init__.py | 2 +- user_tasks/admin.py | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/user_tasks/__init__.py b/user_tasks/__init__.py index 83e56cdc..34f65668 100644 --- a/user_tasks/__init__.py +++ b/user_tasks/__init__.py @@ -6,7 +6,7 @@ from django.dispatch import Signal -__version__ = '0.1.7' +__version__ = '0.1.8' default_app_config = 'user_tasks.apps.UserTasksConfig' # pylint: disable=invalid-name diff --git a/user_tasks/admin.py b/user_tasks/admin.py index 0e9cbe70..ec68a2c9 100644 --- a/user_tasks/admin.py +++ b/user_tasks/admin.py @@ -9,5 +9,18 @@ from .models import UserTaskArtifact, UserTaskStatus -admin.site.register(UserTaskArtifact) -admin.site.register(UserTaskStatus) + +class UserTaskArtifactAdmin(admin.ModelAdmin): + list_display = ('created', 'uuid', 'status', 'name', 'text') + ordering = ('created') + search_fields = ('uuid', 'name', 'text') + + +class UserTaskStatusAdmin(admin.ModelAdmin): + list_display = ('created', 'uuid', 'state', 'user', 'name') + ordering = ('created') + search_fields = ('uuid', 'task_id', 'task_class', 'user', 'name') + + +admin.site.register(UserTaskArtifact, UserTaskArtifactAdmin) +admin.site.register(UserTaskStatus, UserTaskStatusAdmin) From 33b1422a2c2f3e1fe1ec644ce8259f40188f78ea Mon Sep 17 00:00:00 2001 From: Kyle McCormick Date: Fri, 23 Aug 2019 14:59:27 -0400 Subject: [PATCH 2/5] fixup! Inane documentation --- user_tasks/admin.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_tasks/admin.py b/user_tasks/admin.py index ec68a2c9..8b1d1779 100644 --- a/user_tasks/admin.py +++ b/user_tasks/admin.py @@ -11,12 +11,14 @@ class UserTaskArtifactAdmin(admin.ModelAdmin): + """ Admin class UserTaskArtifact """ list_display = ('created', 'uuid', 'status', 'name', 'text') ordering = ('created') search_fields = ('uuid', 'name', 'text') class UserTaskStatusAdmin(admin.ModelAdmin): + """ Admin class UserTaskStatus """ list_display = ('created', 'uuid', 'state', 'user', 'name') ordering = ('created') search_fields = ('uuid', 'task_id', 'task_class', 'user', 'name') From a8caf8055b2dfd3c88621d5a12474894a3cfdc20 Mon Sep 17 00:00:00 2001 From: Kyle McCormick Date: Fri, 23 Aug 2019 15:15:38 -0400 Subject: [PATCH 3/5] fixup! Make the inane documentation gramatically correct --- user_tasks/admin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user_tasks/admin.py b/user_tasks/admin.py index 8b1d1779..14095b51 100644 --- a/user_tasks/admin.py +++ b/user_tasks/admin.py @@ -11,14 +11,14 @@ class UserTaskArtifactAdmin(admin.ModelAdmin): - """ Admin class UserTaskArtifact """ + """ Configuration for UserTaskArtifact admin panel. """ list_display = ('created', 'uuid', 'status', 'name', 'text') ordering = ('created') search_fields = ('uuid', 'name', 'text') class UserTaskStatusAdmin(admin.ModelAdmin): - """ Admin class UserTaskStatus """ + """ Configuration for UserTaskStatus admin panel. """ list_display = ('created', 'uuid', 'state', 'user', 'name') ordering = ('created') search_fields = ('uuid', 'task_id', 'task_class', 'user', 'name') From 69a355a78b10facd13ffbccbf18b119f872dc0b9 Mon Sep 17 00:00:00 2001 From: Kyle McCormick Date: Fri, 23 Aug 2019 15:16:31 -0400 Subject: [PATCH 4/5] fixup! Waste vertical space --- user_tasks/admin.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/user_tasks/admin.py b/user_tasks/admin.py index 14095b51..974bd71d 100644 --- a/user_tasks/admin.py +++ b/user_tasks/admin.py @@ -11,14 +11,18 @@ class UserTaskArtifactAdmin(admin.ModelAdmin): - """ Configuration for UserTaskArtifact admin panel. """ + """ + Configuration for UserTaskArtifact admin panel. + """ list_display = ('created', 'uuid', 'status', 'name', 'text') ordering = ('created') search_fields = ('uuid', 'name', 'text') class UserTaskStatusAdmin(admin.ModelAdmin): - """ Configuration for UserTaskStatus admin panel. """ + """ + Configuration for UserTaskStatus admin panel. + """ list_display = ('created', 'uuid', 'state', 'user', 'name') ordering = ('created') search_fields = ('uuid', 'task_id', 'task_class', 'user', 'name') From ca40b6fea75d24367652fec130c9c3784d820b9d Mon Sep 17 00:00:00 2001 From: Kyle McCormick Date: Fri, 23 Aug 2019 15:26:10 -0400 Subject: [PATCH 5/5] fixup! This blank line makes everything more readable --- user_tasks/admin.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user_tasks/admin.py b/user_tasks/admin.py index 974bd71d..76fae360 100644 --- a/user_tasks/admin.py +++ b/user_tasks/admin.py @@ -14,6 +14,7 @@ class UserTaskArtifactAdmin(admin.ModelAdmin): """ Configuration for UserTaskArtifact admin panel. """ + list_display = ('created', 'uuid', 'status', 'name', 'text') ordering = ('created') search_fields = ('uuid', 'name', 'text') @@ -23,6 +24,7 @@ class UserTaskStatusAdmin(admin.ModelAdmin): """ Configuration for UserTaskStatus admin panel. """ + list_display = ('created', 'uuid', 'state', 'user', 'name') ordering = ('created') search_fields = ('uuid', 'task_id', 'task_class', 'user', 'name')