diff --git a/src/agenda_culturel/calendar.py b/src/agenda_culturel/calendar.py index 9b88dd2..84adcc4 100644 --- a/src/agenda_culturel/calendar.py +++ b/src/agenda_culturel/calendar.py @@ -269,7 +269,7 @@ class CalendarList: Q(other_versions__representative__isnull=True) ).order_by("start_time", "title__unaccent__lower") - qs = qs.select_related("exact_location").select_related("category").select_related("other_versions").select_related("other_versions__representative") + qs = qs.select_related("category").select_related("other_versions").select_related("other_versions__representative") self.events = qs firstdate = datetime.fromordinal(self.c_firstdate.toordinal()) diff --git a/src/agenda_culturel/models.py b/src/agenda_culturel/models.py index b6bfeed..e1f2505 100644 --- a/src/agenda_culturel/models.py +++ b/src/agenda_culturel/models.py @@ -285,7 +285,7 @@ class Tag(models.Model): result = ((_('Suggestions'), [(t["tag"], t["tag"]) for t in tags1]), (_('Others'), [(t["tag"], t["tag"]) for t in tags2])) - cache.set(id_cache, result, 300) # 5mn + cache.set(id_cache, result, 3000) # 50mn return result def __str__(self): @@ -1825,7 +1825,7 @@ class Event(models.Model): def get_concurrent_events(self, remove_same_dup=True): day = self.current_date if hasattr(self, "current_date") else self.start_day - day_events = CalendarDay(day, qs = Event.objects.filter(status=Event.STATUS.PUBLISHED)).get_events() + day_events = CalendarDay(day, qs = Event.objects.filter(status=Event.STATUS.PUBLISHED).only("start_day", "start_time", "title", "category", "other_versions", "recurrences", "end_day", "end_time", "uuids")).get_events() return [ e for e in day_events diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py index 07ec891..f182e29 100644 --- a/src/agenda_culturel/views.py +++ b/src/agenda_culturel/views.py @@ -214,7 +214,7 @@ def month_view(request, year=None, month=None, cat=None): month = now.month request = EventFilter.set_default_values(request) - qs = get_event_qs(request) + qs = get_event_qs(request).only("title", "start_day", "start_time", "category", "other_versions", "recurrences", "end_day", "end_time", "uuids", "status", "tags") if cat is not None: category = Category.objects.filter(slug=cat).first() qs = qs.filter(category=category) @@ -246,7 +246,7 @@ def week_view(request, year=None, week=None, home=False, cat=None): week = now.isocalendar()[1] request = EventFilter.set_default_values(request) - qs = get_event_qs(request) + qs = get_event_qs(request).select_related("exact_location") if cat is not None: category = Category.objects.filter(slug=cat).first() qs = qs.filter(category=category) @@ -282,7 +282,7 @@ def upcoming_events(request, year=None, month=None, day=None, neighsize=1, cat=N day = day + timedelta(days=neighsize) request = EventFilter.set_default_values(request) - qs = get_event_qs(request) + qs = get_event_qs(request).select_related("exact_location") if cat is not None: category = Category.objects.filter(slug=cat).first() qs = qs.filter(category=category)