misc: distinct active and available tracks in artist view

diff --git a/nonstop/models.py b/nonstop/models.py
index 75631049ab1dd184bf4b3bd4088b100f1f1aa34a..591a4155dac80fc471b03144eb5bcfb2dc2ce0c5 100644 (file)
--- a/nonstop/models.py
+++ b/nonstop/models.py
@@ -43,6 +43,12 @@ class Artist(models.Model):
         return SomaLogLine.objects.filter(filepath__track__artist=self
                 ).exclude(on_air=False).order_by('-play_timestamp')
 
+    def active_tracks(self):
+        return self.track_set.filter(nonstop_zones__isnull=False).distinct().order_by('title')
+
+    def available_tracks(self):
+        return self.track_set.filter(nonstop_zones__isnull=True).order_by('title')
+
 
 class Album(models.Model):
     name = models.CharField(_('Name'), max_length=255)

diff --git a/nonstop/templates/nonstop/artist_detail.html b/nonstop/templates/nonstop/artist_detail.html
index 50174f095901a47e0a1358e21fe6d47656442cc0..3738b73df885c949b930b0b8bacd4c032a693d13 100644 (file)
--- a/nonstop/templates/nonstop/artist_detail.html
+++ b/nonstop/templates/nonstop/artist_detail.html
@@ -30,12 +30,29 @@
 </ul>
 </div>
 
+<div class="section">
+<h3>{% trans "Active tracks" %}</h3>
+
+<ul>
+{% for track in object.active_tracks %}
+<li><a href="{{ track.get_absolute_url }}" class="tracktitle">{{ track.title }}</a>
+        ({% for zone in track.nonstop_zones.all %}{{zone}}{% if not forloop.last %}, {% endif %}{% endfor %})
+</li>
+{% empty %}
+<li><i>{% trans "(none)" %}</i></li>
+{% endfor %}
+</ul>
+</div>
+
+
 <div class="section">
 <h3>{% trans "Available tracks" %}</h3>
 
 <ul>
-{% for track in object.track_set.all %}
+{% for track in object.available_tracks %}
 <li><a href="{{ track.get_absolute_url }}" class="tracktitle">{{ track.title }}</a></li>
+{% empty %}
+<li><i>{% trans "(none)" %}</i></li>
 {% endfor %}
 </ul>
 </div>