From 88c77c8ea368eb097f3e2b7c5cf8da50be02eb56 Mon Sep 17 00:00:00 2001 From: Eva Davitasvili Date: Mon, 25 Jun 2018 14:08:42 -0400 Subject: [PATCH] MDL-60014 assign: Annotate PDF - catch no permission error --- .../classes/task/convert_submissions.php | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/mod/assign/feedback/editpdf/classes/task/convert_submissions.php b/mod/assign/feedback/editpdf/classes/task/convert_submissions.php index 9d89738f189..6771820171e 100644 --- a/mod/assign/feedback/editpdf/classes/task/convert_submissions.php +++ b/mod/assign/feedback/editpdf/classes/task/convert_submissions.php @@ -92,20 +92,18 @@ class convert_submissions extends scheduled_task { } mtrace('Convert ' . count($users) . ' submission attempt(s) for assignment ' . $assignmentid); - $keepinqueue = false; + foreach ($users as $userid) { - $combineddocument = document_services::get_combined_pdf_for_attempt($assignment, $userid, $attemptnumber); - $status = $combineddocument->get_status(); - - switch ($combineddocument->get_status()) { - case combined_document::STATUS_READY: - case combined_document::STATUS_PENDING_INPUT: - // The document has not been converted yet or is somehow still ready. - $keepinqueue = true; - continue; - } - try { + $combineddocument = document_services::get_combined_pdf_for_attempt($assignment, $userid, $attemptnumber); + $status = $combineddocument->get_status(); + + switch ($combineddocument->get_status()) { + case combined_document::STATUS_READY: + case combined_document::STATUS_PENDING_INPUT: + // The document has not been converted yet or is somehow still ready. + continue; + } document_services::get_page_images_for_attempt( $assignment, $userid, @@ -120,14 +118,12 @@ class convert_submissions extends scheduled_task { ); } catch (\moodle_exception $e) { mtrace('Conversion failed with error:' . $e->errorcode); - $keepinqueue = true; } } - if (!$keepinqueue) { - // Remove from queue unless requested not to. - $DB->delete_records('assignfeedback_editpdf_queue', array('id' => $record->id)); - } + // Remove from queue. + $DB->delete_records('assignfeedback_editpdf_queue', array('id' => $record->id)); + } }