From 83d7d8364b9febc3f0d08144aca231c57f3b5f1b Mon Sep 17 00:00:00 2001 From: Ruben Young On <r.d.youngon@student.tudelft.nl> Date: Sun, 19 May 2019 14:19:46 +0200 Subject: [PATCH] Deleting a feedback option in a finalized exam will throw an error --- zesje/api/feedback.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/zesje/api/feedback.py b/zesje/api/feedback.py index 0ed472b1..686afb51 100644 --- a/zesje/api/feedback.py +++ b/zesje/api/feedback.py @@ -140,14 +140,11 @@ class Feedback(Resource): db.session.commit() # Delete mc_options associated with this feedback option - if fb.mc_option: + if fb.mc_option and fb.problem.exam.finalized: + return dict(status=401, message='Cannot delete feedback option' + + ' attached to a multiple choice option in a finalized exam.'), 401 - # Check if the exam with this feedback option - if fb.problem.exam.finalized: - return dict(status=401, message='Cannot delete feedback option' - + ' attached to a multiple choice option in a finalized exam.'), 401 - - db.session.delete(fb.mc_option) - db.session.commit() + db.session.delete(fb.mc_option) + db.session.commit() return dict(status=200, message=f"Feedback option with id {feedback_id} deleted."), 200 -- GitLab