use new get_public_label accessor for nonstop zones

diff --git a/panikweb/templates/grid.html b/panikweb/templates/grid.html
index 0ea270be43a5d5c979bea23322077b0dadf66d40..bdb0b8b3476bc872bc9afd2dfcdb8e66194d18a1 100644 (file)
--- a/panikweb/templates/grid.html
+++ b/panikweb/templates/grid.html
@@ -61,7 +61,7 @@
                                        {% endfor %}
                                      {% else %}
                                       <div class="continu"><strong><a
-                                          href="{% if cell.redirect_path %}{{ cell.redirect_path }}{% else %}{% url 'emission-view' slug=cell.nonstop_slug %}{% endif %}">{{ cell }}</a></strong></div>
+                                          href="{% if cell.redirect_path %}{{ cell.redirect_path }}{% else %}{% url 'emission-view' slug=cell.nonstop_slug %}{% endif %}">{{ cell.get_public_label }}</a></strong></div>
                                        {% if cell.w > 1 and cell.h > 1%}<p>la musique en continu</p>{% endif %}
                                      {% endif %}
                          </td>

diff --git a/panikweb/views.py b/panikweb/views.py
index 6f0619405edf5ee05dee0e325361c17dd9ad5d9a..bf3c04c2bffcdb432e840db32d5eb6b16ce2ac84 100644 (file)
--- a/panikweb/views.py
+++ b/panikweb/views.py
@@ -670,7 +670,7 @@ def onair(request):
     if d.get('nonstop'):
         redirect_path = d['nonstop'].redirect_path
         d['nonstop'] = {
-            'title': d['nonstop'].title,
+            'title': d['nonstop'].get_public_label(),
         }
         if redirect_path:
             d['nonstop']['url'] = redirect_path