1
0
mirror of https://github.com/PlagiarismCheck/moodle-plagiarism_pchkorg.git synced 2024-12-22 04:10:07 +00:00

v3.14.7 Add compapability with bulk upload plugin

This commit is contained in:
Jane Adelmann 2024-03-05 12:56:36 +02:00
parent 6208bf4ff3
commit faaca3e8ac
No known key found for this signature in database
GPG Key ID: 4CCF39DF30B8AF72
2 changed files with 5 additions and 9 deletions

10
lib.php
View File

@ -797,16 +797,12 @@ display: inline-block;"
// Set the author and submitter. // Set the author and submitter.
$submitter = $eventdata['userid']; $submitter = $eventdata['userid'];
$author = (!empty($eventdata['relateduserid'])) ? $eventdata['relateduserid'] : $eventdata['userid'];
// Related user ID will be NULL if an instructor submits on behalf of a student who is in a group. // Related user ID will be NULL if an instructor submits on behalf of a student who is in a group.
// To get around this, we get the group ID, get the group members and set the author as the first student in the group. // To get around this, we get the group ID, get the group members and set the author as the first student in the group.
if ((empty($eventdata['relateduserid'])) && ($eventdata['other']['modulename'] == 'assign') if ((empty($eventdata['relateduserid'])) && ($eventdata['other']['modulename'] == 'assign')
&& has_capability('mod/assign:editothersubmission', $context, $submitter)) { && has_capability('mod/assign:editothersubmission', $context, $submitter)) {
$moodlesubmission = $DB->get_record('assign_submission', array('id' => $eventdata['objectid']), 'id, groupid'); $moodlesubmission = $DB->get_record('assign_submission', array('id' => $eventdata['objectid']), 'id, groupid');
if (!empty($moodlesubmission->groupid)) {
$author = $this->get_first_group_author($cm->course, $moodlesubmission->groupid);
}
} }
if ($eventdata['other']['modulename'] === 'forum' if ($eventdata['other']['modulename'] === 'forum'
@ -976,7 +972,7 @@ display: inline-block;"
$moodlesubmission = $DB->get_record('assign_submission', array('id' => $eventdata['objectid']), 'id'); $moodlesubmission = $DB->get_record('assign_submission', array('id' => $eventdata['objectid']), 'id');
$moodletextsubmission = $DB->get_record('assignsubmission_onlinetext', $moodletextsubmission = $DB->get_record('assignsubmission_onlinetext',
array('submission' => $moodlesubmission->id), 'onlinetext'); array('submission' => $eventdata['objectid']), 'onlinetext');
if ($moodletextsubmission) { if ($moodletextsubmission) {
$eventdata['other']['content'] = $moodletextsubmission->onlinetext; $eventdata['other']['content'] = $moodletextsubmission->onlinetext;
@ -984,8 +980,8 @@ display: inline-block;"
$filesconditions = array( $filesconditions = array(
'component' => 'assignsubmission_file', 'component' => 'assignsubmission_file',
'itemid' => $moodlesubmission->id, 'itemid' => $eventdata['objectid'],
'userid' => $author 'userid' => $eventdata['userid']
); );
$moodlefiles = $DB->get_records('files', $filesconditions); $moodlefiles = $DB->get_records('files', $filesconditions);

View File

@ -26,9 +26,9 @@ defined('MOODLE_INTERNAL') || die();
if (!isset($plugin)) { if (!isset($plugin)) {
$plugin = new stdClass(); $plugin = new stdClass();
} }
$plugin->version = 2023112019; $plugin->version = 2024030512;
$plugin->requires = 2020061501; // Requires Moodle 3.9 . $plugin->requires = 2020061501; // Requires Moodle 3.9 .
$plugin->release = 'v3.14.6'; $plugin->release = 'v3.14.7';
$plugin->component = 'plagiarism_pchkorg'; $plugin->component = 'plagiarism_pchkorg';
$plugin->maturity = MATURITY_STABLE; $plugin->maturity = MATURITY_STABLE;
$plugin->dependencies = array( $plugin->dependencies = array(