diff --git a/apps/conference/models.py b/apps/conference/models.py index 65088d3a..f0a8e806 100644 --- a/apps/conference/models.py +++ b/apps/conference/models.py @@ -146,30 +146,6 @@ class Conference(TranslatableModel, EventMixin, ExpoMixin): def __unicode__(self): return self.lazy_translation_getter('name', unicode(self.pk)) - def get_services(self): - return self.get_services_detail() - # country_ids = [item for item, bool in self.country.services if bool==True] - # ids = [item for item, bool in self.services if bool==True] - - # qs = Service.objects.filter(Q(Q(url__in=country_ids) & Q(type=Service.type.conference)) | Q(url__in=ids)) - - # return list(qs) - #return list(Service.objects.language().filter(url__in=ids, type=Service.type.conference).order_by('sort')) - - def get_services_detail(self): - # excluded = ['tickets'] - return super(Conference, self).get_services_detail(None, Service.type.conference) - - # def get_nearest_events(self): - # if self.theme.all(): - # theme = self.theme.all()[0] - # now = datetime.datetime.now() - # now = now - datetime.timedelta(days=1) - # conferences = Conference.objects.filter(theme__in=[theme], data_begin__gt=now).exclude(id=self.id).order_by('data_begin') - # return conferences[:3] - # else: - # return [] - def get_audience(self): return self.audience.all() diff --git a/apps/conference/tests/test_models.py b/apps/conference/tests/test_models.py index b1cd5448..680afc5a 100644 --- a/apps/conference/tests/test_models.py +++ b/apps/conference/tests/test_models.py @@ -1,11 +1,8 @@ import datetime -from accounts.models import User -from django.contrib.contenttypes.models import ContentType from django.core.urlresolvers import reverse, NoReverseMatch from django.test import TestCase from expobanner.models import Paid, Banner -from service.models import Service from stats_collector.models import ObjectStats from theme.models import Tag, Theme @@ -71,16 +68,6 @@ class ConferenceTest(TestCase): 'name', unicode(self.conference.pk)) ) - def test_method_get_services(self): - services = [item for item, bool in self.conference.services if bool] - qs = Service.objects.language() - qs = qs.filter(url__in=services) - - self.assertEqual( - sorted(self.conference.get_services(), key=lambda x: x.pk), - sorted(list(qs), key=lambda x: x.pk) - ) - def test_method_get_news_url(self): self.assertEqual( self.conference.get_news_url(), diff --git a/apps/exposition/models.py b/apps/exposition/models.py index 85f07fa1..15acefab 100644 --- a/apps/exposition/models.py +++ b/apps/exposition/models.py @@ -5,7 +5,6 @@ from django.contrib.contenttypes import generic from django.core.urlresolvers import reverse_lazy from django.db import models from django.db.models.signals import post_save, pre_save -from django.dispatch import receiver from django.utils import translation from django.utils.translation import ugettext as _ from events.models import TargetAudience @@ -171,19 +170,6 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin): def get_price(self): return self.price_day or self.price_all - def get_services(self): - return self.get_services_detail() - # country_ids = [item for item, bool in self.country.services if bool==True] - # ids = [item for item, bool in self.services if bool==True] - - # qs = Service.objects.language().filter(Q(Q(url__in=country_ids) & Q(type=Service.type.expo)) | Q(url__in=ids)) - - # return list(qs) - - def get_services_detail(self): - excluded = ['visit'] - return super(Exposition, self).get_services_detail(excluded, Service.type.expo) - def get_parent(self): return {} diff --git a/apps/functions/model_mixin.py b/apps/functions/model_mixin.py index 680a4d4b..9610dd78 100644 --- a/apps/functions/model_mixin.py +++ b/apps/functions/model_mixin.py @@ -245,38 +245,6 @@ class EventMixin(object): def cancel(self): self.canceled_by_administrator = True - def get_services(self): - - country_ids = [item for item, bool in self.country.services if bool==True] - ids = [item for item, bool in self.services if bool==True and item in country_ids] - - return list(Service.objects.language().filter(url__in=ids).order_by('sort')) - - def get_services_detail(self, excluded, _type): - if not isinstance(getattr(self, '_get_services_detail', None), list): - # excluded = ['visit', 'tickets'] - # country_ids = [item for item, bool in self.country.services if bool==True] - services = [item for item, bool in self.services if bool] - qs = Service.objects.language() - if excluded is not None: - qs = qs.exclude(url__in=excluded) - # qs = qs.filter(Q(Q(url__in=country_ids) & Q(type=_type)) | Q(url__in=ids)) - qs = qs.filter(url__in=services) - self._get_services_detail = list(qs) - # import pdb; pdb.set_trace() - #двигаем билеты сразу за переводом - if excluded is None or 'tickets' not in excluded: - translator_idx = tickets = None - for idx, service in enumerate(self._get_services_detail): - if service.url == 'translator': - translator_idx = idx + 1 - elif service.url == 'tickets': - tickets = service - if tickets and translator_idx: - self._get_services_detail.remove(tickets) - self._get_services_detail.insert(translator_idx, tickets) - return self._get_services_detail - def duration_days(self, month=None): if not month: d = self.data_end - self.data_begin diff --git a/apps/place_exposition/views.py b/apps/place_exposition/views.py index d438c3c3..0b6073fa 100644 --- a/apps/place_exposition/views.py +++ b/apps/place_exposition/views.py @@ -237,7 +237,6 @@ class PlaceExpositionListView(MetadataMixin, ListView): места, по ссылке "Все события" """ template_name = 'client/place/place_exposition_list.html' - # cache_range = settings.CACHE_RANGE def get_object(self): slug = self.kwargs.get('slug') diff --git a/apps/service/models.py b/apps/service/models.py index b2dbed81..43df840f 100644 --- a/apps/service/models.py +++ b/apps/service/models.py @@ -6,7 +6,7 @@ from django.db.models.signals import post_save from django.utils.translation import ugettext as _ from functions.custom_fields import EnumField from functions.signal_handlers import post_save_handler -from hvad.models import TranslatableModel, TranslatedFields, TranslationManager +from hvad.models import TranslatableModel, TranslatedFields CURENCIES = ('', 'USD', 'RUB', 'EUR') diff --git a/apps/service/urls.py b/apps/service/urls.py index 9eee7cc6..59786a70 100644 --- a/apps/service/urls.py +++ b/apps/service/urls.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from django.conf.urls import patterns, include, url +from django.conf.urls import patterns, url from views import ServiceView, CallBackListView, VisitListView, TranslationListView, AdvertisingListView, \ ParticipationListView, RemoteListView,TicketsListView, Thanks diff --git a/apps/service/views.py b/apps/service/views.py index 979245e1..26fce496 100644 --- a/apps/service/views.py +++ b/apps/service/views.py @@ -2,23 +2,17 @@ import json from itertools import chain -from django.http import HttpResponse from django.views.generic import ListView, FormView, TemplateView from django.shortcuts import get_object_or_404 -from django.http import Http404 from django.http import HttpResponseRedirect, HttpResponse -from haystack.query import EmptySearchQuerySet - from meta.views import MetadataMixin -from accounts.models import UserLog from exposition.models import Exposition from conference.models import Conference -from functions.custom_views import ExpoListView from models import Service from order_forms import TranslationForm, CatalogForm, VisitForm, RemoteForm, ParticipationForm, TicketsForm,\ AdvertiseForm, BuildStandForm -#from functions.search_forms import CompanySearchForm +from service.models import CallBack, Visit, Translation, Advertising, Participation, Remote, Tickets order_forms = {'translator': TranslationForm, 'catalog': CatalogForm, 'participation': ParticipationForm, @@ -121,12 +115,12 @@ def advertise(request, catalog=None, event_url=None): raise HttpResponse('not ajax') -from service.models import CallBack, Visit, Translation, Advertising, Participation, Remote, Tickets class AbstractOrderListView(ListView): template_name = 'c_admin/service/order_list.html' paginate_by = 20 + class CallBackListView(AbstractOrderListView): model = CallBack @@ -138,15 +132,19 @@ class VisitListView(AbstractOrderListView): class TranslationListView(AbstractOrderListView): model = Translation + class AdvertisingListView(AbstractOrderListView): model = Advertising + class ParticipationListView(AbstractOrderListView): model = Participation + class RemoteListView(AbstractOrderListView): model = Remote + class TicketsListView(AbstractOrderListView): model = Tickets diff --git a/templates/client/includes/conference/conference_object.html b/templates/client/includes/conference/conference_object.html index e29a3647..db97e01a 100644 --- a/templates/client/includes/conference/conference_object.html +++ b/templates/client/includes/conference/conference_object.html @@ -110,7 +110,6 @@ - {% include 'client/includes/conference/conference_services.html' with event=event %} {% include 'includes/event_steps.html' with event=event %} {% if event.get_photos %} {% with photos=event.get_photos|slice:"5" %} diff --git a/templates/client/includes/conference/conference_partner.html b/templates/client/includes/conference/conference_partner.html index 99805748..25031d4b 100644 --- a/templates/client/includes/conference/conference_partner.html +++ b/templates/client/includes/conference/conference_partner.html @@ -87,7 +87,6 @@ {% if event.org %} {% trans 'Организатор' %}: {{ event.org }} {% endif %} -  {% trans 'Подписаться на новости' %} @@ -110,6 +109,7 @@ {% trans 'фото' %} {% endif %} +
{% trans 'Напомнить о выставке' %}
@@ -165,10 +165,6 @@ {% endif %} {% endwith %} -{#

 {% trans 'Подписаться на новости' %}   {% blocktrans with name=event.name|safe %}Получайте актуальную информацию о концеренции {{ name }} на свой email{% endblocktrans %}

#} - - -{# {% include 'client/includes/conference/conference_services.html' with event=event %}#} {% include 'client/includes/event_steps.html' with event=event %}
diff --git a/templates/client/includes/conference/conference_services.html b/templates/client/includes/conference/conference_services.html deleted file mode 100644 index b98f4d71..00000000 --- a/templates/client/includes/conference/conference_services.html +++ /dev/null @@ -1,13 +0,0 @@ -{% load i18n %} - -
- -
\ No newline at end of file diff --git a/templates/client/includes/event_list.html b/templates/client/includes/event_list.html index f478270b..705b835e 100644 --- a/templates/client/includes/event_list.html +++ b/templates/client/includes/event_list.html @@ -15,12 +15,12 @@
{% endif %} {% endif %} -
+
{% with obj=obj %} {% include 'client/includes/show_logo.html' %} {% endwith %}
- +
{% if user.is_staff %} @@ -68,21 +68,11 @@
-
- {% trans 'услуги' %} -
- -
-
{% with event=obj user=user %} {% include 'client/includes/calendar_button.html' %} {% endwith %} - {% trans 'заметка' %} + {% trans 'заметка' %}
diff --git a/templates/client/includes/exposition/exposition_object.html b/templates/client/includes/exposition/exposition_object.html index 68cba167..2b3d6bd7 100644 --- a/templates/client/includes/exposition/exposition_object.html +++ b/templates/client/includes/exposition/exposition_object.html @@ -91,10 +91,6 @@
{% endif %} -
-  {% trans 'Подписаться на новости' %} -
-
@@ -112,7 +108,7 @@ {% trans 'фото' %} {% endif %}
-
{% trans 'Найти отель' %}
+
{% trans 'Напомнить о выставке' %}
@@ -138,8 +134,6 @@
- {% include 'client/includes/exposition/exposition_services.html' with object=exposition %} - {% include 'client/includes/event_steps.html' with event=exposition %} {% if exposition.get_photos %} diff --git a/templates/client/includes/exposition/exposition_services.html b/templates/client/includes/exposition/exposition_services.html deleted file mode 100644 index 8a591f15..00000000 --- a/templates/client/includes/exposition/exposition_services.html +++ /dev/null @@ -1,18 +0,0 @@ -{% load i18n %} - -
- -
diff --git a/templates/client/includes/exposition/price.html b/templates/client/includes/exposition/price.html index 5489b4b1..ec5a5c0c 100644 --- a/templates/client/includes/exposition/price.html +++ b/templates/client/includes/exposition/price.html @@ -257,13 +257,3 @@
{{ exposition.name|safe }}
- -
- -
diff --git a/templates/client/includes/exposition/programm.html b/templates/client/includes/exposition/programm.html index 073ffd67..541aa9f4 100644 --- a/templates/client/includes/exposition/programm.html +++ b/templates/client/includes/exposition/programm.html @@ -130,13 +130,3 @@
{{ exposition.name|safe }}
- -
- -
diff --git a/templates/client/includes/exposition/services.html b/templates/client/includes/exposition/services.html index ec8a50a9..d841af4f 100644 --- a/templates/client/includes/exposition/services.html +++ b/templates/client/includes/exposition/services.html @@ -15,12 +15,6 @@ {% elif obj.partner %}
  • {% trans 'Официальный сайт' %}
  • {% trans 'Билеты' %}
    • - {% else %} - {% with services=obj.get_services %} - {% for service in services %} -
  • {{ service.name }}
    • - {% endfor %} - {% endwith %} {% endif %}
    diff --git a/templates/client/includes/exposition/statistic.html b/templates/client/includes/exposition/statistic.html index eafc4341..e53d277c 100644 --- a/templates/client/includes/exposition/statistic.html +++ b/templates/client/includes/exposition/statistic.html @@ -154,14 +154,3 @@
    {{ exposition.name|safe }}
    - -
    - -
    - diff --git a/templates/client/includes/services.html b/templates/client/includes/services.html index ca56f4dd..e8c87c25 100644 --- a/templates/client/includes/services.html +++ b/templates/client/includes/services.html @@ -4,7 +4,7 @@ diff --git a/templates/client/place/place_detail.html b/templates/client/place/place_detail.html index c82a8a2d..026d9da0 100644 --- a/templates/client/place/place_detail.html +++ b/templates/client/place/place_detail.html @@ -260,20 +260,7 @@
    -
    - {% trans 'услуги' %} - -
    - -
    -
    - {% trans 'в расписание' %} - {% trans 'заметка' %}
    diff --git a/templates/client/place/place_exposition_list.html b/templates/client/place/place_exposition_list.html index d5ec003c..a60ecd5b 100644 --- a/templates/client/place/place_exposition_list.html +++ b/templates/client/place/place_exposition_list.html @@ -60,20 +60,7 @@
    -
    - {% trans 'услуги' %} - -
    - -
    -
    - {% trans 'в расписание' %} - {% trans 'заметка' %}