merge diffusions and episode, work on different fixes, duration are timefield, make it work

website/admin.py

@@ -38,15 +38,9 @@ def add_inline (base_model, post_model, prepend = False):
 
 
 add_inline(programs.Program, Program, True)
-add_inline(programs.Episode, Episode, True)
+# add_inline(programs.Episode, Episode, True)
 
 admin.site.register(Program)
-admin.site.register(Episode)
-
-#class ArticleAdmin (DescriptionAdmin):
-#    fieldsets = copy.deepcopy(DescriptionAdmin.fieldsets)
-#
-#    fieldsets[1][1]['fields'] += ['static_page']
-
+# admin.site.register(Episode)
 
 

website/models.py

@@ -14,11 +14,11 @@ class Program (RelatedPost):
 
 class Episode (RelatedPost):
     class Relation:
-        model = programs.Episode
+        model = programs.Diffusion
         bind_mapping = True
         mapping = {
             'thread': 'program',
-            'title': 'name',
-            'content': 'description',
+            # 'title': 'name',
+            # 'content': 'description',
         }