mirror of
https://github.com/moodle/moodle.git
synced 2025-08-11 20:06:46 +02:00
Merge branch 'MDL-71909' of https://github.com/NeillM/moodle
This commit is contained in:
commit
e1a6cdba0c
2 changed files with 37 additions and 0 deletions
|
@ -51,6 +51,14 @@ class observer {
|
|||
* @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'],
|
||||
|
|
|
@ -578,4 +578,33 @@ class feedback_test extends \advanced_testcase {
|
|||
$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);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue