0004-agendas-remove-dead-code-56615.patch
chrono/agendas/models.py | ||
---|---|---|
870 | 870 |
] |
871 | 871 | |
872 | 872 |
@staticmethod |
873 |
def prefetch_events_and_exceptions(qs, annotate_events=False, user_external_id=None):
|
|
873 |
def prefetch_events_and_exceptions(qs, user_external_id=None): |
|
874 | 874 |
event_queryset = Event.objects.filter( |
875 | 875 |
Q(publication_date__isnull=True) | Q(publication_date__lte=localtime(now()).date()), |
876 | 876 |
recurrence_days__isnull=True, |
... | ... | |
880 | 880 | |
881 | 881 |
if user_external_id: |
882 | 882 |
event_queryset = Event.annotate_queryset_for_user(event_queryset, user_external_id) |
883 |
if annotate_events: |
|
884 |
event_queryset = Event.annotate_queryset(event_queryset) |
|
885 | 883 | |
886 | 884 |
recurring_event_queryset = Event.objects.filter( |
887 | 885 |
Q(publication_date__isnull=True) | Q(publication_date__lte=localtime(now()).date()), |
888 |
- |