admin: put related media, transcoded files and markers in item inlines

diff --git a/example/sandbox/settings.py b/example/sandbox/settings.py
index ca2f9a87119f2c0b77e3902441423c6ae3adf489..c1bbc2eab765d437d3a81277a02a06a9e8687f30 100644 (file)
--- a/example/sandbox/settings.py
+++ b/example/sandbox/settings.py
@@ -2,7 +2,7 @@
 # Django settings for sandbox project.
 
 import os
-from django.core.urlresolvers import reverse_lazy
+from django.core.urlresolvers import reverse_lazy, reverse
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
@@ -113,7 +113,6 @@ TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    '',
 )
 
 INSTALLED_APPS = (
@@ -161,7 +160,7 @@ AUTH_PROFILE_MODULE = 'telemeta.userprofile'
 SESSION_EXPIRE_AT_BROWSER_CLOSE = False
 
 LOGIN_URL = '/login/'
-LOGIN_REDIRECT_URL = reverse_lazy('telemeta-desk-lists')
+LOGIN_REDIRECT_URL = '/desk/lists/'
 
 EMAIL_HOST = 'localhost'
 DEFAULT_FROM_EMAIL = 'webmaster@parisson.com'

diff --git a/telemeta/admin.py b/telemeta/admin.py
index 2ca31d18a5822e0eab35edec4d23299464b0bf75..034e5c849d4f5237f2762d061382f892e83a48a9 100644 (file)
--- a/telemeta/admin.py
+++ b/telemeta/admin.py
@@ -20,20 +20,30 @@ class MediaCorpusAdmin(admin.ModelAdmin):
     ordering = ['code']
     filter_horizontal = ['children']
 
+class MediaCollectionRelatedInline(admin.StackedInline):
+    model = MediaCollectionRelated
+
 class MediaCollectionAdmin(admin.ModelAdmin):
     search_fields = ['title', 'code']
     ordering = ['code']
+    inlines = [MediaCollectionRelatedInline]
+
+class MediaItemRelatedInline(admin.StackedInline):
+    model = MediaItemRelated
+
+class MediaItemMarkerInline(admin.StackedInline):
+    model = MediaItemMarker
 
-class MediaCollectionRelatedAdmin(admin.ModelAdmin):
-    search_fields = ['title', 'description']
+class MediaItemTranscodedInline(admin.StackedInline):
+    model = MediaItemTranscoded
 
 class MediaItemAdmin(admin.ModelAdmin):
     search_fields = ['title', 'code']
     ordering = ['code']
     exclude = ('copied_from_item', )
-
-class MediaItemRelatedAdmin(admin.ModelAdmin):
-    search_fields = ['title', 'description']
+    inlines = [MediaItemRelatedInline, 
+                MediaItemTranscodedInline,
+                MediaItemMarkerInline]
 
 class MediaPartAdmin(admin.ModelAdmin):
     search_fields = ['title', 'item__code']
@@ -90,10 +100,6 @@ admin.site.register(MediaCollection, MediaCollectionAdmin)
 admin.site.register(MediaItem, MediaItemAdmin)
 admin.site.register(MediaPart, MediaPartAdmin)
 
-admin.site.register(MediaItemRelated, MediaItemRelatedAdmin)
-admin.site.register(MediaCollectionRelated, MediaCollectionRelatedAdmin)
-admin.site.register(MediaItemTranscoded)
-
 admin.site.register(Instrument, InstrumentAdmin)
 admin.site.register(InstrumentAlias, InstrumentAliasAdmin)
 admin.site.register(InstrumentRelation, InstrumentRelationAdmin)