From 3c08e721c179f9f92f0ac13f3bd7843402b9dcb4 Mon Sep 17 00:00:00 2001 From: RishabhJain2018 Date: Wed, 19 Jul 2017 04:47:41 +0530 Subject: [PATCH] Add Import Export Time Stamped Admin class to all apps. --- apps/hosts/admin.py | 8 +++----- apps/jobs/admin.py | 6 ++---- apps/participants/admin.py | 7 +++---- apps/web/admin.py | 6 +++--- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/apps/hosts/admin.py b/apps/hosts/admin.py index f13d31ff88..4b042b51ee 100644 --- a/apps/hosts/admin.py +++ b/apps/hosts/admin.py @@ -1,21 +1,19 @@ from django.contrib import admin -from base.admin import TimeStampedAdmin +from base.admin import ImportExportTimeStampedAdmin from .models import (ChallengeHost, ChallengeHostTeam) -from import_export.admin import ImportExportModelAdmin - @admin.register(ChallengeHostTeam) -class ChallengeHostTeamModelAdmin(TimeStampedAdmin, ImportExportModelAdmin): +class ChallengeHostTeamModelAdmin(ImportExportTimeStampedAdmin): list_display = ("team_name", "created_by") search_fields = ("team_name", "created_by") @admin.register(ChallengeHost) -class ChallengeHostAdmin(TimeStampedAdmin, ImportExportModelAdmin): +class ChallengeHostAdmin(ImportExportTimeStampedAdmin): list_display = ("user", "team_name", "status", "permissions") list_filter = ("status", "permissions") search_fields = ("user", "team_name") diff --git a/apps/jobs/admin.py b/apps/jobs/admin.py index 80609bc2c4..f9cb76fb6b 100644 --- a/apps/jobs/admin.py +++ b/apps/jobs/admin.py @@ -1,14 +1,12 @@ from django.contrib import admin -from base.admin import TimeStampedAdmin +from base.admin import ImportExportTimeStampedAdmin from .models import Submission -from import_export.admin import ImportExportModelAdmin - @admin.register(Submission) -class SubmissionAdmin(TimeStampedAdmin, ImportExportModelAdmin): +class SubmissionAdmin(ImportExportTimeStampedAdmin): list_display = ('participant_team', 'challenge_phase', 'created_by', 'status', 'is_public', 'submission_number', 'submitted_at', 'execution_time', 'input_file', 'stdout_file', 'stderr_file', 'submission_result_file', 'submission_metadata_file', ) diff --git a/apps/participants/admin.py b/apps/participants/admin.py index 84d8c1bba7..23b5cd6c5a 100644 --- a/apps/participants/admin.py +++ b/apps/participants/admin.py @@ -1,13 +1,12 @@ from django.contrib import admin -from base.admin import TimeStampedAdmin +from base.admin import ImportExportTimeStampedAdmin from .models import ( Participant, ParticipantTeam, ) from import_export import resources -from import_export.admin import ImportExportModelAdmin class ParticipantResource(resources.ModelResource): @@ -19,7 +18,7 @@ class Meta: @admin.register(Participant) -class ParticipantAdmin(TimeStampedAdmin, ImportExportModelAdmin): +class ParticipantAdmin(ImportExportTimeStampedAdmin): """ An abstract base class which provides an interface to display user and team status. @@ -31,7 +30,7 @@ class ParticipantAdmin(TimeStampedAdmin, ImportExportModelAdmin): @admin.register(ParticipantTeam) -class ParticipantTeamAdmin(TimeStampedAdmin, ImportExportModelAdmin): +class ParticipantTeamAdmin(ImportExportTimeStampedAdmin): """ A class which provides interface to display and filter team names. diff --git a/apps/web/admin.py b/apps/web/admin.py index ce5570f921..42f104550e 100644 --- a/apps/web/admin.py +++ b/apps/web/admin.py @@ -1,18 +1,18 @@ from django.contrib import admin -from base.admin import TimeStampedAdmin +from base.admin import ImportExportTimeStampedAdmin from .models import Contact, Team @admin.register(Contact) -class ContactAdmin(TimeStampedAdmin): +class ContactAdmin(ImportExportTimeStampedAdmin): list_display = ("name", "email", "message",) search_fields = ("email",) @admin.register(Team) -class TeamAdmin(admin.ModelAdmin): +class TeamAdmin(ImportExportTimeStampedAdmin): list_filter = ("team_type",) list_display = ("name", "email", "team_type",) search_fields = ("email", "name",)