diff --git a/program/services.py b/program/services.py index eed89ef9fec58a32b9dacc1453490be3384d456d..46269308f7b0deedcf07e9c0020f6e59e07c5e4e 100644 --- a/program/services.py +++ b/program/services.py @@ -229,7 +229,7 @@ def resolve_conflicts(data, schedule_pk, show_pk): # If there were any errors, don't make any db changes yet # but add error messages and return already chosen solutions if len(errors) > 0: - conflicts = Schedule.make_conflicts(model_to_dict(schedule), schedule.pk, show.pk) + conflicts = make_conflicts(model_to_dict(schedule), schedule.pk, show.pk) partly_resolved = conflicts["projected"] saved_solutions = {} @@ -396,7 +396,7 @@ def make_conflicts(sdl, schedule_pk, show_pk): timeslots = generate_timeslots(gen_schedule) # Generate conflicts and add schedule - conflicts = Schedule.generate_conflicts(timeslots) + conflicts = generate_conflicts(timeslots) conflicts["schedule"] = model_to_dict(schedule) return conflicts