Skip to content
Snippets Groups Projects
Verified Commit df1235eb authored by Ernesto Rico Schmidt's avatar Ernesto Rico Schmidt
Browse files

Fixed usage of extracted functions

parent 4b4ef80d
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
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