From a6165166f46b84e1563ae24b411688e03804c966 Mon Sep 17 00:00:00 2001 From: Slava Kyrachevsky Date: Thu, 26 Jan 2017 10:24:36 +0200 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=BC=D0=B5=D0=BD=D0=B0=20=D1=81=D0=BE?= =?UTF-8?q?=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B8=20=D1=84=D0=B8?= =?UTF-8?q?=D0=BB=D1=8C=D1=82=D1=80=D0=BE=D0=B2=20=D0=BF=D1=80=D0=B8=20?= =?UTF-8?q?=D0=B2=D1=8B=D0=B1=D1=80=D0=B0=D0=BD=D0=BD=D0=BE=D0=B9=20=D1=82?= =?UTF-8?q?=D0=B5=D0=BC=D0=B0=D1=82=D0=B8=D0=BA=D0=B8=20=D0=B8=D0=BB=D0=B8?= =?UTF-8?q?=20=D1=82=D0=B5=D0=B3=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 28 ------------------- apps/events/forms.py | 11 ++++++-- apps/events/views.py | 15 +++------- templates/client/base_catalog.html | 11 ++------ .../client/includes/events/filter_form.html | 2 -- 5 files changed, 15 insertions(+), 52 deletions(-) diff --git a/README.md b/README.md index a4d15e4f..d61fcb84 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,6 @@ Expomap project -#mysql -sudo apt-get install mysql-server mysql-client libmysqlclient-dev mysql-workbench -#memcached -sudo apt-get install libmemcached-dev - -# south -pip install south -U - ### proj/local.py EXAMPLE ```python # -*- coding: utf-8 -*- @@ -67,20 +59,6 @@ DEBUG_TOOLBAR_PANELS = [ ] ``` -# -```sh -python manage.py syncdb --settins=proj.local -python manage.py migrate settings 0001 --fake --settins=proj.local -python manage.py migrate settings --settins=proj.local -``` -# -```sh -python manage.py migrate accounts 0001 --fake -python manage.py migrate accounts -python manage.py migrate company 0001 --fake -python manage.py migrate company -``` - # solr setup ```sh @@ -98,10 +76,4 @@ bin/solr start -p 8983 Если возникает ошибка Solr: [Reason: Error 404 Not Found] - http://stackoverflow.com/a/30633740 -# -```sh -python manage.py migrate expobanner 0001 --fake -python manage.py migrate expobanner -``` - Каталог support хранит конфиги для продакшн сервера diff --git a/apps/events/forms.py b/apps/events/forms.py index bf75b7d3..43e47dce 100644 --- a/apps/events/forms.py +++ b/apps/events/forms.py @@ -244,8 +244,7 @@ class FilterForm(forms.Form): price = FilterTypedMultipleChoiceField( label=_(u'Стоимость'), coerce=int, choices=PRICE, - required=False, widget=FilterCheckboxSelectMultiple(), - # help_text=_(u'За 1 м2 необорудованной площади') + required=False, widget=FilterCheckboxSelectMultiple() ) price_eur = FilterTypedMultipleChoiceField( label=_(u'Стоимость'), coerce=int, @@ -281,6 +280,12 @@ class FilterForm(forms.Form): self.fill_default_choices_from_cache() self.fields['month'].choices = self.month_choices() + if self.data.get('tag') or self.data.get('theme'): + self.fields.keyOrder.remove('country') + self.fields.keyOrder.insert(1, 'country') + self.fields.keyOrder.remove('city') + self.fields.keyOrder.insert(2, 'city') + @property def is_exposition(self): types = self.cleaned_data.get('event_type', []) @@ -312,7 +317,7 @@ class FilterForm(forms.Form): month = datetime.today().month if cls._month != month or cls._month_choices is None: year = datetime.today().year - depth = 7 # на сколько сколько месяцев вперед делать выборку (включая текущий) + depth = 7 # на сколько сколько месяцев вперед делать выборку (включая текущий) monthes = dict([(v.get('value'), {'abr': k, 'name': v.get('name')}) for k, v in settings.MONTHES.iteritems()]) choices = [] for month_num in xrange(month, month + depth): diff --git a/apps/events/views.py b/apps/events/views.py index a160ac5b..56947b3c 100644 --- a/apps/events/views.py +++ b/apps/events/views.py @@ -1,18 +1,13 @@ # -*- coding: utf-8 -*- from django.core.exceptions import ObjectDoesNotExist -from django.core.urlresolvers import reverse, reverse_lazy +from django.core.urlresolvers import reverse_lazy from django.db.models import Q -from django.http import Http404 from django.http import HttpResponseForbidden from django.http import HttpResponseNotFound -from django.http import HttpResponsePermanentRedirect from django.views.generic.edit import FormMixin, FormView from django.conf import settings from django.template.loader import render_to_string from django.template import RequestContext -from django.utils.translation import ugettext_lazy as _ - -from haystack.query import SearchQuerySet from emencia.django.newsletter.forms import ContactForm from emencia.django.newsletter.models import Contact @@ -31,7 +26,7 @@ class FilterListView_(ContextMixin, FormMixin, ListView): initial_ctx = {'filtering': True} form_class = FilterForm paginate_by = settings.CLIENT_PAGINATION - template_name = 'events/filter_listview.html' + template_name = 'client/events/filter_listview.html' _ajax_results_template_name = 'events/filter_listview_ajax.html' _ajax_form_template_name = 'includes/events/filter_form.html' @@ -43,13 +38,10 @@ class FilterListView_(ContextMixin, FormMixin, ListView): def get_queryset(self): if self.form.is_valid(): qs = self.form.filter() - # import pdb; pdb.set_trace() else: qs = self.form.default_filter() if self.kwargs.get('with_form', True): self.form.recalculate_choices() - # print(self.form.data, self.form.cleaned_data, self.form.get_date_begin_periods()) - # import pdb; pdb.set_trace() return qs def get(self, request, *args, **kwargs): @@ -86,6 +78,7 @@ class FilterListView_(ContextMixin, FormMixin, ListView): return context + class FilterListView(ReverseOrderMixin, FilterListView_): pass @@ -191,4 +184,4 @@ def event_visit(request, event_type, id): else: args['not_authorized'] = True args['success'] = True - return JsonResponse(args) \ No newline at end of file + return JsonResponse(args) diff --git a/templates/client/base_catalog.html b/templates/client/base_catalog.html index 1f632633..32b52761 100644 --- a/templates/client/base_catalog.html +++ b/templates/client/base_catalog.html @@ -1,10 +1,7 @@ {% extends 'client/blank.html' %} - -{% load static %} -{% load i18n %} +{% load static i18n %} {% load template_filters %} - {% block main_part %}
@@ -14,16 +11,14 @@
{% include 'client/includes/feedback.html' %}
- {% comment %} - {% endcomment %} {# {% include 'client/includes/online_consult.html' %} #} - {% if filtering == True %} + {% if filtering %}
{% include 'client/includes/events/filter_form.html' %}
- {% elif can_filter == True %} + {% elif can_filter %} diff --git a/templates/client/includes/events/filter_form.html b/templates/client/includes/events/filter_form.html index 024ece98..6e084255 100644 --- a/templates/client/includes/events/filter_form.html +++ b/templates/client/includes/events/filter_form.html @@ -11,7 +11,6 @@
- {# {% csrf_token %} #} {% for hidden in form.hidden_fields %} {{ hidden }} {% endfor %} @@ -30,7 +29,6 @@ {% endfor %} {{ form.get_dates }} - {# #}
{% include 'client/popups/filter_period.html' %}