diff --git a/apps/company/admin.py b/apps/company/admin.py index a2a0f843..0b0c6598 100644 --- a/apps/company/admin.py +++ b/apps/company/admin.py @@ -43,7 +43,6 @@ def company_delete(request, url): @login_required def company_change(request, url): - print('URL\n' + url) """ Return form and fill it with existing Company object data. diff --git a/apps/emencia/django/newsletter/admin_forms.py b/apps/emencia/django/newsletter/admin_forms.py index b984140f..ed8b7029 100644 --- a/apps/emencia/django/newsletter/admin_forms.py +++ b/apps/emencia/django/newsletter/admin_forms.py @@ -276,14 +276,12 @@ class NewsletterRecommendForm(forms.ModelForm): def clean_event(self): event = self.cleaned_data.get('event') - print(event) match = self.rx.match(event) if not match: raise forms.ValidationError(_(u'Введены неверные данные')) model = self.event_models.get(match.group('type')) self.event_model = model event_id = match.group('pk') - print(model, event_id, event) try: event = model.objects.get(pk=event_id) except model.DoesNotExist: diff --git a/apps/functions/custom_views.py b/apps/functions/custom_views.py index e70ef018..b4f26f5e 100644 --- a/apps/functions/custom_views.py +++ b/apps/functions/custom_views.py @@ -486,7 +486,6 @@ class SimpleObjectChangeView(RedirectView, SingleObjectMixin): def get(self, request, *args, **kwargs): self.object = self.get_object() self.change_object() - print(self.request.META.get('QUERY_STRING', '')) return super(SimpleObjectChangeView, self).get(request, *args, **kwargs) diff --git a/apps/functions/utils.py b/apps/functions/utils.py index 66b4aaf4..89498487 100644 --- a/apps/functions/utils.py +++ b/apps/functions/utils.py @@ -21,7 +21,6 @@ def strfdelta(tdelta, fmt): class CachedSting(object): def __init__(self, path, timeout=None): super(CachedSting, self).__init__() - print('initiated', path) self.path = path self.timeout = timeout or timedelta(days=1) self.get_object() diff --git a/apps/place_exposition/models.py b/apps/place_exposition/models.py index f700cc5b..8ce1b19e 100644 --- a/apps/place_exposition/models.py +++ b/apps/place_exposition/models.py @@ -196,8 +196,13 @@ class PlaceExposition(TranslatableModel, ExpoMixin): if not self.address: return [] # get coordinates of all hotels in current city - qs_hotels_all = self.city.hotels.filter(city=self.city) - hotels_coord = [(hotel.latitude, hotel.longitude) for hotel in qs_hotels_all] + qs_hotels_all = self.city.hotels.language().filter( + city=self.city + ).values( + 'latitude', 'longitude', 'url', 'photo', 'name', + 'min_price', 'currency' + ) + hotels_coord = [(hotel['latitude'], hotel['longitude']) for hotel in qs_hotels_all] # coordinate current place place_coord = (float(self.address['lat']), float(self.address['lng'])) # 4 coordinates of 4 nearest hotels diff --git a/apps/settings/forms.py b/apps/settings/forms.py index e2638138..63c4758b 100644 --- a/apps/settings/forms.py +++ b/apps/settings/forms.py @@ -197,7 +197,6 @@ class EventDefaultDescriptionEditForm(forms.Form): for field_name, path in templates.iteritems(): try: with open(os.path.join(settings.SITE_ROOT, path), 'w+') as f: - print(self.cleaned_data.get(field_name)) f.write(self.cleaned_data.get(field_name).encode('utf-8')) except Exception as e: print(e) diff --git a/apps/theme/models.py b/apps/theme/models.py index d8e1b3c5..c5c2736e 100644 --- a/apps/theme/models.py +++ b/apps/theme/models.py @@ -63,19 +63,19 @@ class Theme(TranslatableModel): def expositions_number(self): - return Exposition.enable.upcoming().filter(theme__id=self.id).count() + return Exposition.enable.upcoming().filter(theme=self).count() def conferences_number(self): - return Conference.enable.upcoming().filter(theme__id=self.id).count() + return Conference.enable.upcoming().filter(theme=self).count() def seminars_number(self): - return Seminar.objects.filter(theme__id=self.id).count() + return Seminar.objects.filter(theme=self).count() def webinars_number(self): - return Webinar.objects.filter(theme__id=self.id).count() + return Webinar.objects.filter(theme=self).count() def events_number(self): return self.expositions_number() + self.conferences_number() + self.seminars_number() + self.webinars_number() diff --git a/templates/client/includes/exposition/tags.html b/templates/client/includes/exposition/tags.html index 71c42583..9320e937 100644 --- a/templates/client/includes/exposition/tags.html +++ b/templates/client/includes/exposition/tags.html @@ -1,5 +1,3 @@ -{% with tags=obj.tags %} - {% for tag in tags %} - {{ tag.name }}{% if forloop.counter != tags|length %},{% endif %} - {% endfor %} -{% endwith %} \ No newline at end of file +{% for tag in obj.tags.all %} + {{ tag.name }}{% if not forloop.last %},{% endif %} +{% endfor %} diff --git a/templates/client/includes/index/main_events.html b/templates/client/includes/index/main_events.html deleted file mode 100644 index c2c68afa..00000000 --- a/templates/client/includes/index/main_events.html +++ /dev/null @@ -1,72 +0,0 @@ -{% load thumbnail %} -{% load i18n %} -{% load template_filters %} - - - -
- -
- -
- - -
-
-
\ No newline at end of file diff --git a/templates/client/index.html b/templates/client/index.html index 55dcb0ab..2a8f2519 100644 --- a/templates/client/index.html +++ b/templates/client/index.html @@ -1,152 +1,223 @@ -{% extends "blank.html" %} -{% load static %} -{% load i18n %} +{% extends "client/blank.html" %} +{% load static i18n %} {% load thumbnail %} {% load template_filters %} + {% block styles %} {% endblock %} + {% block body_class %} class="main-page" {% endblock %} {% block top %} -
-
- - - - {% include 'client/includes/index/main_events.html' with events=events %} - -
-
+
+
+ + + +
+ +
+ +
+ + +
+
+
+ + + + + +
+
{% endblock %} {% block search %} - {% include 'client/includes/catalog_search_main.html' with search_form=search_form %} + {% include 'client/includes/catalog_search_main.html' with search_form=search_form %} {% endblock %} {% block catalog %} -
-
+
+
- -
-
+
+
-
- {% include 'client/includes/index/expos.html' with themes=exposition_themes %} -
+
+ {% include 'client/includes/index/expos.html' with themes=exposition_themes %} +
-
- {% include 'client/includes/index/confs.html' with themes=conference_themes %} -
+
+ {% include 'client/includes/index/confs.html' with themes=conference_themes %} +
-
+
{% include 'client/includes/banners/main_page_inner.html' %} -
+
-
-
+
+
{% endblock %} + {% block announces %} -
-
- - -
-
+
+
+ + +
+
{% if main_page_block %} {{ main_page_block.text|safe }} {% endif %} {% comment %} - - {% endcomment %} -
-
- -
-
+ + {% endcomment %} +
+
+ +
+
{% endblock %} {% block partners %} -
-
-
{% trans 'Наши партнеры:' %}
- -
-
+
+
+
{% trans 'Наши партнеры:' %}
+ +
+
{% endblock %} {% block services %} -
-
- -
-
- {% include 'client/includes/index/blogs.html' with blogs=blogs %} -
-
-
-
+
+
+ +
+
+ {% include 'client/includes/index/blogs.html' with blogs=blogs %} +
+
+
+
{% if request.GET.debug == '1' %}