Skip to content
Snippets Groups Projects
Commit 0717fd02 authored by Hangzhi Yu's avatar Hangzhi Yu
Browse files

Avoid collision with reserved name

parent 6531ffcc
No related branches found
No related tags found
1 merge request!329Introduce substitution to do list
Pipeline #193181 failed
...@@ -1578,7 +1578,7 @@ class LessonEvent(CalendarEvent): ...@@ -1578,7 +1578,7 @@ class LessonEvent(CalendarEvent):
not_amending = params.get("not_amending", False) not_amending = params.get("not_amending", False)
amending = params.get("amending", False) amending = params.get("amending", False)
own = params.get("own", False) own = params.get("own", False)
all = params.get("all", False) return_all = params.get("all", False)
if prefetch_absences: if prefetch_absences:
objs = objs.prefetch_related("teachers__kolego_absences") objs = objs.prefetch_related("teachers__kolego_absences")
...@@ -1612,7 +1612,7 @@ class LessonEvent(CalendarEvent): ...@@ -1612,7 +1612,7 @@ class LessonEvent(CalendarEvent):
elif type_ == "OWNER": elif type_ == "OWNER":
return objs.for_owner(obj_id) return objs.for_owner(obj_id)
if "own" in params or all: if "own" in params or return_all:
return objs return objs
if request: if request:
return objs.for_person(request.user.person) return objs.for_person(request.user.person)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment