parent
bf30d1ebc1
commit
d7dec94beb
@ -269,7 +269,7 @@ class CalendarList:
|
|||||||
Q(other_versions__representative__isnull=True)
|
Q(other_versions__representative__isnull=True)
|
||||||
).order_by("start_time", "title__unaccent__lower")
|
).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
|
self.events = qs
|
||||||
|
|
||||||
firstdate = datetime.fromordinal(self.c_firstdate.toordinal())
|
firstdate = datetime.fromordinal(self.c_firstdate.toordinal())
|
||||||
|
@ -285,7 +285,7 @@ class Tag(models.Model):
|
|||||||
result = ((_('Suggestions'), [(t["tag"], t["tag"]) for t in tags1]),
|
result = ((_('Suggestions'), [(t["tag"], t["tag"]) for t in tags1]),
|
||||||
(_('Others'), [(t["tag"], t["tag"]) for t in tags2]))
|
(_('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
|
return result
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
@ -1825,7 +1825,7 @@ class Event(models.Model):
|
|||||||
|
|
||||||
def get_concurrent_events(self, remove_same_dup=True):
|
def get_concurrent_events(self, remove_same_dup=True):
|
||||||
day = self.current_date if hasattr(self, "current_date") else self.start_day
|
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 [
|
return [
|
||||||
e
|
e
|
||||||
for e in day_events
|
for e in day_events
|
||||||
|
@ -214,7 +214,7 @@ def month_view(request, year=None, month=None, cat=None):
|
|||||||
month = now.month
|
month = now.month
|
||||||
|
|
||||||
request = EventFilter.set_default_values(request)
|
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:
|
if cat is not None:
|
||||||
category = Category.objects.filter(slug=cat).first()
|
category = Category.objects.filter(slug=cat).first()
|
||||||
qs = qs.filter(category=category)
|
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]
|
week = now.isocalendar()[1]
|
||||||
|
|
||||||
request = EventFilter.set_default_values(request)
|
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:
|
if cat is not None:
|
||||||
category = Category.objects.filter(slug=cat).first()
|
category = Category.objects.filter(slug=cat).first()
|
||||||
qs = qs.filter(category=category)
|
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)
|
day = day + timedelta(days=neighsize)
|
||||||
|
|
||||||
request = EventFilter.set_default_values(request)
|
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:
|
if cat is not None:
|
||||||
category = Category.objects.filter(slug=cat).first()
|
category = Category.objects.filter(slug=cat).first()
|
||||||
qs = qs.filter(category=category)
|
qs = qs.filter(category=category)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user