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 %}