Fix price==0 but reserve, de-ignore var (!)

diff --git a/.gitignore b/.gitignore
index 127fa30736aebb26a8095238f0171e43b4d72bdf..45b65c2e2c166bdce9a997784a0be05e873ecb97 100644 (file)
--- 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 4c6adc7db581153ec6c9bcdd675c71e522dc76a9..af37ea4ad860542c7fb599ba5fdd765cc3201f0c 100644 (file)
--- 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 8b6a0680cc8905469183624b648df3f4d98cc55a..a3d67ab70138812f8e1260e8ffa11eef2fc19c4d 100755 (executable)
--- 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"