From 51616a895647bf5cf17a34dcb44b26925a741321 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 4 Mar 2015 00:12:17 +0100 Subject: [PATCH] add admin models --- timeside/server/admin.py | 16 ++++++++++++++-- timeside/server/models.py | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/timeside/server/admin.py b/timeside/server/admin.py index 11916e3..91508dc 100644 --- a/timeside/server/admin.py +++ b/timeside/server/admin.py @@ -3,6 +3,18 @@ from django.contrib import admin from timeside.server.models import * +class SelectionAdmin(admin.ModelAdmin): + model = Selection + list_display = ['__unicode__', 'date_added', 'date_modified'] + list_filter = ['date_modified'] + filter_horizontal = ['items', 'selections'] + +class ExperienceAdmin(admin.ModelAdmin): + model = Experience + list_display = ['__unicode__', 'date_added', 'date_modified'] + list_filter = ['date_modified'] + filter_horizontal = ['presets', 'experiences'] + class TaskAdmin(admin.ModelAdmin): model = Task list_display = ['__unicode__', 'date_added', 'date_modified', 'status'] @@ -15,9 +27,9 @@ class ResultAdmin(admin.ModelAdmin): -admin.site.register(Selection) +admin.site.register(Selection, SelectionAdmin) admin.site.register(Item) -admin.site.register(Experience) +admin.site.register(Experience, ExperienceAdmin) admin.site.register(Processor) admin.site.register(Preset) admin.site.register(Result, ResultAdmin) diff --git a/timeside/server/models.py b/timeside/server/models.py index bed3a7e..8406c79 100644 --- a/timeside/server/models.py +++ b/timeside/server/models.py @@ -271,7 +271,7 @@ class Task(BaseResource): verbose_name_plural = _('Tasks') def __unicode__(self): - return '_'.join([unicode(self.experience), unicode(self.id)]) + return '_'.join([unicode(self.selection), unicode(self.experience), unicode(self.id)]) def status_setter(self, status): self.status = status -- 2.39.5