|
|
|
|
@ -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'] |
|
|
|
|
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().exclude(url__in=excluded).filter(Q(Q(url__in=country_ids) & Q(type=Service.type.conference)) | Q(url__in=ids)) |
|
|
|
|
return list(qs) |
|
|
|
|
# excluded = ['tickets'] |
|
|
|
|
return super(Conference, self).get_services_detail(None, Service.type.conference) |
|
|
|
|
|
|
|
|
|
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) |
|
|
|
|
|