From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 11 Oct 2016 10:18:06 +0000 (+0200)
Subject: Fix double links
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ea2ba6cf88ef905dddaeaad421908ca475c7990c;p=mezzo.git

Fix double links
---

diff --git a/app/templates/agenda/event_detail.html b/app/templates/agenda/event_detail.html
index c494d6bb..ed865c08 100644
--- a/app/templates/agenda/event_detail.html
+++ b/app/templates/agenda/event_detail.html
@@ -80,20 +80,23 @@
 
     <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">
diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda
index 310ee7e2..04b66f16 160000
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@ -1 +1 @@
-Subproject commit 310ee7e277ae066ed7a90ab6310dfbdc52eca0f6
+Subproject commit 04b66f1604f971ce3b58dfa656bdadc2e57a8620