Skip to content

Commit

Permalink
MDL-71909 assignfeedback_editpdf: Do not queue conversions when not on
Browse files Browse the repository at this point in the history
Before this change conversion tasks would be queued for assignments that
did not have the pdf annotation method enabled.

The change will also prevent queing when the plugin is disabled.
  • Loading branch information
NeillM committed Jul 26, 2023
1 parent b4cd637 commit 3a06a2f
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 0 deletions.
8 changes: 8 additions & 0 deletions mod/assign/feedback/editpdf/classes/event/observer.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,14 @@ public static function submission_updated(\mod_assign\event\submission_updated $
* @param \mod_assign\event\base $event The submission created/updated event.
*/
protected static function queue_conversion($event) {
$assign = $event->get_assign();
$plugin = $assign->get_feedback_plugin_by_type('editpdf');

if (!$plugin->is_visible() || !$plugin->is_enabled()) {
// The plugin is not enabled on this assignment instance, so nothing should be queued.
return;
}

$data = [
'submissionid' => $event->other['submissionid'],
'submissionattempt' => $event->other['submissionattempt'],
Expand Down
29 changes: 29 additions & 0 deletions mod/assign/feedback/editpdf/tests/feedback_test.php
Original file line number Diff line number Diff line change
Expand Up @@ -578,4 +578,33 @@ public function test_submission_file_overridden() {
$conversions = \core_files\conversion::get_conversions_for_file($sourcefile, 'pdf');
$this->assertCount(0, $conversions);
}

/**
* Tests that when the plugin is not enabled for an assignment it does not create conversion tasks.
*
* @covers \assignfeedback_editpdf\event\observer
*/
public function test_submission_not_enabled() {
$this->require_ghostscript();
$this->resetAfterTest();
\core\cron::setup_user();

$course = $this->getDataGenerator()->create_course();
$student = $this->getDataGenerator()->create_and_enrol($course, 'student');
$assignopts = [
'assignsubmission_file_enabled' => 1,
'assignsubmission_file_maxfiles' => 1,
'assignfeedback_editpdf_enabled' => 0,
'assignsubmission_file_maxsizebytes' => 1000000,
];
$assign = $this->create_instance($course, $assignopts);

// Add the standard submission.
$this->add_file_submission($student, $assign);

$task = \core\task\manager::get_next_adhoc_task(time());

// No task was created.
$this->assertNull($task);
}
}

0 comments on commit 3a06a2f

Please sign in to comment.