From a6582b3cd0c92fdc2eae7232935d5f6a04c7630e Mon Sep 17 00:00:00 2001 From: Slava Kyrachevsky Date: Fri, 12 May 2017 13:35:43 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=BF?= =?UTF-8?q?=D0=BB=D0=B0=D1=82=D0=BD=D0=BE=D0=B9=20=D0=BA=D0=BE=D0=BD=D1=84?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=BD=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/conference/views.py | 2 +- templates/client/conference/conference_detail.html | 4 +--- templates/client/includes/event_steps.html | 12 ++++++------ 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/apps/conference/views.py b/apps/conference/views.py index 043206f3..0d188951 100644 --- a/apps/conference/views.py +++ b/apps/conference/views.py @@ -461,7 +461,7 @@ class ConferenceDetail(ObjectStatMixin, CommentMixin, JitterCacheMixin, Metadata # except City.DoesNotExist: # return super(ConferenceDetail, self).dispatch(request, *args, **kwargs) if city: - return HttpResponseRedirect('/conference/city/%s/'%city.url) + return HttpResponseRedirect('/conference/city/%s/' % city.url) except Exception: # try: return super(ConferenceDetail, self).dispatch(request, *args, **kwargs) diff --git a/templates/client/conference/conference_detail.html b/templates/client/conference/conference_detail.html index e9855d7f..f71c5da5 100644 --- a/templates/client/conference/conference_detail.html +++ b/templates/client/conference/conference_detail.html @@ -23,14 +23,12 @@ {% endblock %} {% block content_list %} - {% include 'client/includes/conference/conference_partner.html' with event=object %} - {% comment %} +{# {% include 'client/includes/conference/conference_partner.html' with event=object %}#} {% if object.paid_new_id and object.paid_new.public %} {% include 'client/includes/conference/conference_paid.html' with event=object %} {% else %} {% include 'client/includes/conference/conference_object.html' with event=object %} {% endif %} - {% endcomment %} {% endblock %} {% block paginator %} diff --git a/templates/client/includes/event_steps.html b/templates/client/includes/event_steps.html index e673b9ab..73228f40 100644 --- a/templates/client/includes/event_steps.html +++ b/templates/client/includes/event_steps.html @@ -4,7 +4,7 @@
{% if event.catalog == '/expo/' %}{% trans 'Участвовать в выставке' %}{% else %}{% trans 'Посетить конференцию' %}{% endif %}