centralcloud/oncall-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into add-settings-button

Browse source
This commit is contained in:
Maxim 2022-10-06 16:15:14 +03:00
commit ac0610e9b6
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
engine/apps/schedules/models/custom_on_call_shift.py
View file

@ -420,8 +420,7 @@ class CustomOnCallShift(models.Model):
repetitions = UnfoldableCalendar(current_event).RepeatedEvent(
current_event, next_event_start.replace(microsecond=0)
)
ical_iter = repetitions.__iter__()
for event in ical_iter:
for event in repetitions.__iter__():
if end_date: # end_date exists for long events with frequency weekly and monthly
if end_date >= event.start >= next_event_start:
if (
@ -460,8 +459,7 @@ class CustomOnCallShift(models.Model):
repetitions = UnfoldableCalendar(initial_event).RepeatedEvent(
initial_event, initial_event_start.replace(microsecond=0)
)
ical_iter = repetitions.__iter__()
for event in ical_iter:
for event in repetitions.__iter__():
if event.start > date:
break
last_event = event