integrate qcombine with routes; default routes in website; search in tags too; qcombine fixes (search, model); website's Publications model

website/models.py

@@ -7,11 +7,12 @@ logger = logging.getLogger('aircox')
 from django.db import models
 from django.utils.translation import ugettext as _, ugettext_lazy
 
-from aircox.cms.models import Post, RelatedPost
 import aircox.programs.models as programs
+import aircox.cms.models as cms
+import aircox.cms.qcombine as qcombine
 
 
-class Article (Post):
+class Article (cms.Post):
     """
     Represent an article or a static page on the website.
     """
@@ -29,7 +30,7 @@ class Article (Post):
         verbose_name_plural = _('Articles')
 
 
-class Program (RelatedPost):
+class Program (cms.RelatedPost):
     website = models.URLField(
         _('website'),
         blank=True, null=True
@@ -49,7 +50,7 @@ class Program (RelatedPost):
         auto_create = True
 
 
-class Diffusion (RelatedPost):
+class Diffusion (cms.RelatedPost):
     class Relation:
         model = programs.Diffusion
         bindings = {
@@ -68,18 +69,7 @@ class Diffusion (RelatedPost):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        if self.thread:
-            if not self.title:
-                self.title = _('{name} // {first_diff}').format(
-                    name = self.related.program.name,
-                    first_diff = self.related.start.strftime('%A %d %B')
-                )
-            if not self.content:
-                self.content = self.thread.content
-            if not self.image:
-                self.image = self.thread.image
-            if not self.tags and self.pk:
-                self.tags = self.thread.tags
+        self.fill_empty()
 
     @property
     def info(self):
@@ -90,7 +80,7 @@ class Diffusion (RelatedPost):
         }
 
 
-class Sound (RelatedPost):
+class Sound (cms.RelatedPost):
     """
     Publication concerning sound. In order to manage access of sound
     files in the filesystem, we use permissions -- it is up to the
@@ -138,3 +128,12 @@ class Sound (RelatedPost):
                     )
                 )
 
+
+class Publications (qcombine.FakeModel):
+    """
+    Combine views
+    """
+    models = [ Article, Program, Diffusion, Sound ]
+
+
+

website/sections.py

@@ -110,7 +110,9 @@ class Diffusions(sections.List):
                 continue
             name = post.related.program.name
             if name not in post.title:
-                post.title = '{}: {}'.format(name, post.title)
+                post.title = ': ' + post.title if post.title else \
+                            ' // ' + post.related.start.strftime('%A %d %B')
+                post.title = name + post.title
         return object_list
 
     def get_object_list(self):

website/templates/aircox/website/player.html

@@ -524,8 +524,10 @@ player = {
     /// Select the next track in the current playlist, eventually play it
     next: function(play = true) {
         var playlist = this.playlist;
+        if(playlist == this.live)
+            return
+
         var index = this.playlist.items.indexOf(this.item);
-        console.log(index, this.item, this.playlist.items)
         if(index == -1)
             return;