Merge branch '1203'

Билеты

conference/models.py

@@ -136,11 +136,8 @@ class Conference(TranslatableModel, EventMixin, ExpoMixin):
         #return list(Service.objects.language().filter(url__in=ids, type=Service.type.conference).order_by('sort'))
 
     def get_services_detail(self):
-        excluded = ['tickets']
+        # excluded = ['tickets']
-        country_ids = [item for item, bool in self.country.services if bool==True]
+        return super(Conference, self).get_services_detail(None, Service.type.conference)
-        ids = [item for item, bool in self.services if bool==True]
-        qs = Service.objects.language().exclude(url__in=excluded).filter(Q(Q(url__in=country_ids) & Q(type=Service.type.conference)) | Q(url__in=ids))
-        return list(qs)
 
     def get_nearest_events(self):
         if self.theme.all():
@@ -242,4 +239,4 @@ class TimeTable(TranslatableModel):
 pre_save.connect(pre_save_handler, sender=Conference)
 post_save.connect(post_save_handler, sender=Conference)
 post_save.connect(post_save_handler, sender=TimeTable)
-post_save.connect(post_save_handler, sender=Statistic)
+post_save.connect(post_save_handler, sender=Statistic)

exposition/models.py

@@ -179,11 +179,8 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin):
         return list(qs)
 
     def get_services_detail(self):
-        excluded = ['visit', 'tickets']
+        excluded = ['visit']
-        country_ids = [item for item, bool in self.country.services if bool==True]
+        return super(Exposition, self).get_services_detail(excluded, Service.type.expo)
-        ids = [item for item, bool in self.services if bool==True]
-        qs = Service.objects.language().exclude(url__in=excluded).filter(Q(Q(url__in=country_ids) & Q(type=Service.type.expo)) | Q(url__in=ids))
-        return list(qs)
 
     def get_parent(self):
         return {}
@@ -359,4 +356,4 @@ pre_save.connect(pre_save_handler, sender=Exposition)
 post_save.connect(post_save_handler, sender=Exposition)
 post_save.connect(post_save_handler, sender=TimeTable)
 post_save.connect(post_save_handler, sender=TmpTimeTable)
-post_save.connect(post_save_handler, sender=Statistic)
+post_save.connect(post_save_handler, sender=Statistic)

functions/model_mixin.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import copy
+from django.db.models import Q
 from django.conf import settings
 from functions.translate import fill_with_signal
 import calendar as python_calendar
@@ -88,6 +89,18 @@ class EventMixin(object):
 
         return list(Service.objects.language().filter(url__in=ids).order_by('sort'))
 
+    def get_services_detail(self, exluded, _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]
+            ids = [item for item, bool in self.services if bool==True]
+            qs = Service.objects.language()
+            if exluded 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))
+            self._get_services_detail = list(qs)
+        return self._get_services_detail
+
     def duration_days(self, month=None):
         if not month:
             d = self.data_end - self.data_begin
@@ -177,4 +190,4 @@ class EventMixin(object):
             for item in source.all():
                 destination.add(item)
 
-        return duplicate
+        return duplicate