add admin models

diff --git a/timeside/server/admin.py b/timeside/server/admin.py
index 11916e341e98b6b93ec9c70c7340c0761831901a..91508dc5a99183a23b3b6d49bbe2bf427091c1d6 100644 (file)
--- 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 bed3a7ebd250676626b3a517f901274c20c64ee3..8406c7974bd55c7dcf13709576f478ea25f5c03e 100644 (file)
--- 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