[EPIC] Review and test "Conflict Resolution" to cover all cases

Especially cases of "false-positives" when concurrent editing of schedules is happening.

Currently the are two parts that implement the conflict resolution: program/models.py, and program/admin.py.

The code is partially used in the API parts of program/views.py.

I need to move the conflict resolution code out of models and the admin into something that can be unit tested.

added Doing label

added 1 deleted label and removed Doing label

added Doing label

added P1 label

changed milestone to %Aura 0.9

marked this issue as related to #43 (closed)

mentioned in issue #62 (closed)

marked this issue as related to #62 (closed)

added EPIC label

changed title from Review and test "Conflict Resolution" to cover all cases to [EPIC] Review and test "Conflict Resolution" to cover all cases

added Blocked label and removed Doing label

@nnrcschmdt

Forget everything regarding conflict resolution in admin.py (you can actually kick everything from line 319 - 568) this was the wrong approach and was never finished.

the real conflict resolution code is in models.py which works via the api.

Reviewed the code and removed the admin code. The API is the only interaction we support.

closed

removed Blocked label