From 28804b3ee7700b9cbe71505ddd244040bc3bab19 Mon Sep 17 00:00:00 2001
From: Alexander Burdeiny <bonus_05@mail.ru>
Date: Tue, 5 Jul 2016 16:38:26 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B2=20=D0=B1=D0=B5=D1=81=D0=BF=D0=BB=D0=B0?=
 =?UTF-8?q?=D1=82=D0=BD=D1=8B=D1=85=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=86=D0=B8=D1=8F=D1=85=20=D1=81=D1=81=D1=8B=D0=BB?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=BD=D0=B0=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA?=
 =?UTF-8?q?=D0=B5=20=D0=A0=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B4=D0=BE=D0=BB=D0=B6=D0=BD=D0=B0=20=D0=B1?=
 =?UTF-8?q?=D1=8B=D1=82=D1=8C=20service/tickets/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fabfile.py                                 | 4 +++-
 templates/client/includes/event_steps.html | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fabfile.py b/fabfile.py
index f3621b8f..0237ff20 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -138,13 +138,14 @@ def stage4_firstrun():
         call_state('stop')
         run('git fetch')
         run('git checkout stage4')
-        run('git checkout -- proj/settings.py')
+        # run('git checkout -- proj/settings.py')
         pull(with_configs=True)
         run('python manage.py syncdb')
         ticket1374()
         ticket1393()
         ticket1392()
         ticket1384()
+        ticket1395()
         ticket1384_p1()
         ticket1384_p2()
         t1443()
@@ -195,6 +196,7 @@ def ticket1384_p2():
     with cd(REMOTE_HOME_DIR):
         run('python manage.py check_translation')
 
+
 @ticket
 def t1443():
     with cd(REMOTE_HOME_DIR):
diff --git a/templates/client/includes/event_steps.html b/templates/client/includes/event_steps.html
index ade96a13..c55714a7 100644
--- a/templates/client/includes/event_steps.html
+++ b/templates/client/includes/event_steps.html
@@ -6,7 +6,7 @@
             <li class="s1">
 				<div class="label">{% if event.catalog == '/expo/' %}{% trans 'Создайте уникальную концепцию' %}{% else %}{% trans 'Зарегистрируйтесь на событие' %}{% endif %}</div>
 			    <a class="step"
-                   href="{% if event.registration_link %}{{ registration_link }}{% else %}{{ event.get_permanent_url }}service/participation/{% endif %}"
+                   href="{% if event.registration_link %}{{ registration_link }}{% else %}{{ event.get_permanent_url }}{% if event.catalog == '/expo/' %}service/participation/{% else %}service/tickets/{% endif %}{% endif %}"
                    target="_blank">
                     {% if event.catalog == '/expo/' %}{% trans 'Заявка на участие' %}{% else %}{% trans 'Регистрация' %}{% endif %}
                 </a>