Conference detail hot fix

remotes/origin/1203
Kotiuk Nazarii 11 years ago
parent 18b0555226
commit d98def65b2
  1. 4
      proj/views.py
  2. 16
      templates/client/includes/conference/conference_object.html
  3. 9
      templates/client/includes/exposition/exposition_object.html

@ -37,7 +37,9 @@ def error404(request):
expo_themes = Theme.active.expo_themes_with_count()
conf_themes = Theme.active.conference_themes_with_count()
context.update({'expo_themes': expo_themes, 'conf_themes': conf_themes})
return render_to_response('client/404.html', context, context_instance=RequestContext(request))
response = render_to_response('client/404.html', context, context_instance=RequestContext(request))
response.status_code = 404
return response
class MainPageView(JitterCacheMixin,TemplateView):
cache_range = settings.CACHE_RANGE

@ -152,6 +152,22 @@
{% endfor %}
{% endwith %}
</dd>
{% else %}
{% if event.org %}
<dt>{% trans 'Организатор' %}:</dt>
<dd>
{{ event.org }}
</dd>
{% endif %}
{% endif %}
{% if event.place_alt %}
{% if not event.place %}
<dt>{% trans 'Место проведения' %}:</dt>
<dd>
{{ event.place_alt }}
</dd>
{% endif %}
{% endif %}
{% if event.web_page %}
<dt>{% trans 'Веб-сайт' %}:</dt>

@ -165,6 +165,15 @@
</dd>
{% endif %}
{% endif %}
{% if exposition.place_alt %}
{% if not exposition.place %}
<dt>{% trans 'Место проведения' %}:</dt>
<dd>
{{ exposition.place_alt }}
</dd>
{% endif %}
{% endif %}
{% if exposition.web_page %}
<dt>{% trans 'Веб-сайт' %}:</dt>
<dd>

Loading…
Cancel
Save