]> git.parisson.com Git - mezzo.git/commitdiff
Fix double links
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 11 Oct 2016 10:18:06 +0000 (12:18 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 11 Oct 2016 10:18:06 +0000 (12:18 +0200)
app/templates/agenda/event_detail.html
lib/mezzanine-agenda

index c494d6bb1cd0f422b7c84b982c6f63a8564144b1..ed865c08faaf9383d99756e117c3cc4b709b97ee 100644 (file)
 
     <div class="mt4">
         <div class="row">
-            {% with event.links.all as links %}
-                {% if links %}
-                    <div class="col-xs-6">
-                        {% include 'core/inc/link.html' %}
-                    </div>
-                {% endif %}
-            {% endwith %}
-            {% with child.links.all as links %}
-                {% if links %}
-                    <div class="col-xs-6">
-                        {% include 'core/inc/link.html' %}
-                    </div>
-                {% endif %}
-            {% endwith %}
+            {% if child %}
+                {% with child.links.all as links %}
+                    {% if links %}
+                        <div class="col-xs-6">
+                            {% include 'core/inc/link.html' %}
+                        </div>
+                    {% endif %}
+                {% endwith %}
+            {% else %}
+                {% with event.links.all as links %}
+                    {% if links %}
+                        <div class="col-xs-6">
+                            {% include 'core/inc/link.html' %}
+                        </div>
+                    {% endif %}
+                {% endwith %}
+            {% endif %}
             {% if event.mentions %}
                 <div class="col-xs-6">
                     <div class="small-text">
index 310ee7e277ae066ed7a90ab6310dfbdc52eca0f6..04b66f1604f971ce3b58dfa656bdadc2e57a8620 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 310ee7e277ae066ed7a90ab6310dfbdc52eca0f6
+Subproject commit 04b66f1604f971ce3b58dfa656bdadc2e57a8620