Merge branch 'stage5' of bitbucket.org:Bonus_05/expomap into stage5

fabfile.py

@@ -125,6 +125,7 @@ def stage_init(stage_num):
         run('git fetch')
         run('git checkout stage{stage_num}'.format(stage_num=stage_num))
         run('git pull')
+        stage_num = int(stage_num)
         if stage_num in stages and isinstance(stages[stage_num], dict):
             for func_name, func in stages[stage_num].iteritems():
                 func()
@@ -136,15 +137,17 @@ def t1451():
     with cd(REMOTE_HOME_DIR):
         run('python manage.py migrate expobanner')
 
+# temporary
 register_command('banner_log_update_old')
 register_command('banner_log_update')
-
+#
 
 @stage(5)
 def t1458():
     with cd(REMOTE_HOME_DIR):
         run('python manage.py migrate service 0001 --fake')
         run('python manage.py migrate service')
+        run('python manage.py set_events_services')
 
 register_command('set_events_services')
 
@@ -176,6 +179,15 @@ def update_crontab():
         run('python manage.py crontab add')
 
 
+@stage(5)
+def t1461():
+    with cd(REMOTE_HOME_DIR):
+        run('pip install chainmap==1.0.2')
+        run('python manage.py migrate conference')
+        run('python manage.py migrate exposition')
+        run('python manage.py update_events_filter_fields')
+
+
 @ticket
 def switch_to_stage4():
     with cd(REMOTE_HOME_DIR):

templates/client/includes/events/filter_result.html

@@ -104,13 +104,15 @@
 		</footer>
 	</li>
 
+	{% if not request.is_ajax %}
     {% if forloop.counter == 5 or objects|length < 5 %}
-            {% include 'client/includes/banners/catalog_inner_2.html' %}
+      {% include 'client/includes/banners/catalog_inner_2.html' %}
     {% endif %}
 
     {% if forloop.counter == 10 %}
-        {% include 'client/includes/banners/catalog_inner.html' %}
+      {% include 'client/includes/banners/catalog_inner.html' %}
     {%endif %}
+	{% endif %}
 
 	{% endfor %}
 	{# END FOR #}