Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Import Export Time Stamped Admin class to all apps. #1099

Merged
merged 3 commits into from Aug 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions 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")
6 changes: 2 additions & 4 deletions 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', )
Expand Down
7 changes: 3 additions & 4 deletions 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):
Expand All @@ -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.
Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions 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",)