diff --git a/banners/models.py b/banners/models.py index aa17c039..b9779288 100644 --- a/banners/models.py +++ b/banners/models.py @@ -10,4 +10,4 @@ class Redirect(models.Model): return self.redirect def get_object_url(self): - return '/redirect/reditect/%d/'%self.id + return '/redirect/redirect/%d/'%self.id diff --git a/templates/client/exposition/exposition_detail.html b/templates/client/exposition/exposition_detail.html index 69faaf1f..aa55fdaf 100644 --- a/templates/client/exposition/exposition_detail.html +++ b/templates/client/exposition/exposition_detail.html @@ -16,11 +16,11 @@ {% endblock %} {% block content_list %} - {% ifnotequal object.url 'ipsa-osen-2015' %} + {% if not object.paid %} {% include 'client/includes/exposition/exposition_object.html' with exposition=object %} {% else %} {% include 'client/includes/exposition/expo_paid.html' with exposition=object %} - {% endifnotequal %} + {% endif %} {% endblock %} {% block paginator %} diff --git a/templates/client/includes/exposition/price.html b/templates/client/includes/exposition/price.html index c3dcd52a..5ece2a54 100644 --- a/templates/client/includes/exposition/price.html +++ b/templates/client/includes/exposition/price.html @@ -151,7 +151,11 @@
+ {% if not exposition.paid %} {% trans 'Заказать билет' %} + {% else %} + {% trans 'Заказать билет' %} + {% endif %}
{% if exposition.get_audience %}
@@ -215,8 +219,11 @@ {% else %}

{% trans 'Цены на площадь доступны по запросу' %}

{% endif %} - - {% trans 'Заявка на участие' %} + {% if not exposition.paid %} + {% trans 'Заявка на участие' %} + {% else %} + {% trans 'Заявка на участие' %} + {% endif %} {% if exposition.min_stand_size or exposition.registration_payment or exposition.application_deadline %}