From 5ae04ace51299515844ad0bcd2c0535cb4d7d5e1 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 8 Dec 2016 18:11:21 +0100
Subject: [PATCH] Fix price==0 but reserve, de-ignore var (!)

---
 .gitignore                                        | 1 -
 app/templates/agenda/includes/event_metainfo.html | 2 +-
 bin/pull.sh                                       | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 127fa307..45b65c2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@ sdist
 develop-eggs
 .installed.cfg
 *.directory
-var
 .thumbnails
 .tmp
 *.lock
diff --git a/app/templates/agenda/includes/event_metainfo.html b/app/templates/agenda/includes/event_metainfo.html
index 4c6adc7d..af37ea4a 100644
--- a/app/templates/agenda/includes/event_metainfo.html
+++ b/app/templates/agenda/includes/event_metainfo.html
@@ -41,7 +41,7 @@
 {% endif %}
 
 {% if unit_booking %}
-    {% if event.prices.all.0|floatformat != '0' and event.prices.all|length > 0 %}
+    {% if event.prices.all|length > 0 %}
         {% for price in event.prices.all %}
             {% if forloop.first %}
                 <div class="page__meta-title page__meta-title--small">{% trans "Prices" %}</div>
diff --git a/bin/pull.sh b/bin/pull.sh
index 8b6a0680..a3d67ab7 100755
--- a/bin/pull.sh
+++ b/bin/pull.sh
@@ -3,6 +3,6 @@
 sudo chown -R $USER var/media
 sudo chown -R $USER var/backup
 git pull
-git submodule foreach git pull
+git submodule foreach git pull origin master
 docker-compose run db /srv/bin/db/restore.sh
 docker-compose run app bash -c "cd /srv && bower --allow-root install && gulp build"
-- 
2.39.5