don't allow focus on soundfiles without a type

diff --git a/panikdb/customtags/templatetags/panikdbtags.py b/panikdb/customtags/templatetags/panikdbtags.py
index 66404c2da3724d300b7a0884cff27a061ce40a50..2a03ec813939d903468d03ce6f56fd7bc86f84a2 100644 (file)
--- a/panikdb/customtags/templatetags/panikdbtags.py
+++ b/panikdb/customtags/templatetags/panikdbtags.py
@@ -95,13 +95,13 @@ def set_focus_url(object):
 @register.filter
 def can_focus(object):
     if isinstance(object, NewsItem):
-        return True
+        return bool(object.category and object.image)
     elif isinstance(object, Emission):
         return True
     elif isinstance(object, Episode):
         return True
     elif isinstance(object, SoundFile):
-        return True
+        return bool(object.format)
     return False
 
 

diff --git a/panikdb/templates/base.html b/panikdb/templates/base.html
index 3ec883d26185190ba3b25cbd52f8c150d1727399..8b244a4005fba7866e8b5acf65eeccf140c4fd10 100644 (file)
--- a/panikdb/templates/base.html
+++ b/panikdb/templates/base.html
@@ -52,7 +52,7 @@
             {% endif %}
             {% endblock %}
             {% block manage-focus %}
-            {% if object|can_focus %}
+            {% if object|can_focus or object|has_focus %}
             {% if perms.emissions.add_focus %}
             {% if object|has_focus %}
             <a class="icon-pushpin" href="{{ object|unset_focus_url }}">Retirer le focus</a>

diff --git a/panikdb/templates/emissions/episode_detail.html b/panikdb/templates/emissions/episode_detail.html
index 3895f17010e60b10d85182aa3a69cedd9e599d30..3172b880729ef1f5c1b7a27a5f2a50efa10c38e1 100644 (file)
--- a/panikdb/templates/emissions/episode_detail.html
+++ b/panikdb/templates/emissions/episode_detail.html
@@ -100,7 +100,9 @@ Tags :
 {% if soundfile.has_focus %}
 ✓ <a class="icon-pushpin" href="{{ soundfile|unset_focus_url }}">retirer</a>
 {% else %}
-<a class="icon-pushpin" href="{{ soundfile|set_focus_url }}">mettre</a>
+  {% if soundfile.format %}
+  <a class="icon-pushpin" href="{{ soundfile|set_focus_url }}">mettre</a>
+  {% endif %}
 {% endif %}
 </td>
 {% endif %}