mirror of
https://github.com/moodle/moodle.git
synced 2025-04-20 16:04:25 +02:00
Merge branch 'master_MDL-34593_add_extra_plugin_param_to_get_form_elements_module' of git://github.com/kanikagoyal/moodle
This commit is contained in:
commit
92f2403bf3
@ -102,8 +102,9 @@ function plagiarism_save_form_elements($data) {
|
||||
*
|
||||
* @param object $mform - Moodle form object
|
||||
* @param object $context - context object
|
||||
* @param string $modulename - Name of the module
|
||||
*/
|
||||
function plagiarism_get_form_elements_module($mform, $context) {
|
||||
function plagiarism_get_form_elements_module($mform, $context, $modulename = "") {
|
||||
global $CFG;
|
||||
if (empty($CFG->enableplagiarism)) {
|
||||
return '';
|
||||
@ -113,7 +114,7 @@ function plagiarism_get_form_elements_module($mform, $context) {
|
||||
require_once($dir.'/lib.php');
|
||||
$plagiarismclass = "plagiarism_plugin_$plugin";
|
||||
$plagiarismplugin = new $plagiarismclass;
|
||||
$plagiarismplugin->get_form_elements_module($mform, $context);
|
||||
$plagiarismplugin->get_form_elements_module($mform, $context, $modulename);
|
||||
}
|
||||
}
|
||||
/**
|
||||
|
@ -112,7 +112,7 @@ class mod_assign_mod_form extends moodleform_mod {
|
||||
if (!empty($CFG->enableplagiarism)) {
|
||||
/** Include plagiarismlib.php */
|
||||
require_once($CFG->libdir . '/plagiarismlib.php');
|
||||
plagiarism_get_form_elements_module($mform, $ctx->get_course_context());
|
||||
plagiarism_get_form_elements_module($mform, $ctx->get_course_context(), 'mod_assign');
|
||||
}
|
||||
|
||||
$assignment->add_all_plugin_settings($mform);
|
||||
|
@ -310,7 +310,7 @@ class assignment_online extends assignment_base {
|
||||
$mform->setDefault('var1', 0);
|
||||
|
||||
$coursecontext = context_course::instance($COURSE->id);
|
||||
plagiarism_get_form_elements_module($mform, $coursecontext);
|
||||
plagiarism_get_form_elements_module($mform, $coursecontext, 'mod_assignment');
|
||||
|
||||
}
|
||||
|
||||
|
@ -1082,7 +1082,7 @@ class assignment_upload extends assignment_base {
|
||||
$mform->setDefault('var4', 1);
|
||||
|
||||
$course_context = context_course::instance($COURSE->id);
|
||||
plagiarism_get_form_elements_module($mform, $course_context);
|
||||
plagiarism_get_form_elements_module($mform, $course_context, 'mod_assignment');
|
||||
}
|
||||
|
||||
function portfolio_exportable() {
|
||||
|
@ -294,7 +294,7 @@ class assignment_uploadsingle extends assignment_base {
|
||||
$mform->setDefault('maxbytes', $CFG->assignment_maxbytes);
|
||||
|
||||
$course_context = context_course::instance($COURSE->id);
|
||||
plagiarism_get_form_elements_module($mform, $course_context);
|
||||
plagiarism_get_form_elements_module($mform, $course_context, 'mod_assignment');
|
||||
}
|
||||
|
||||
function portfolio_exportable() {
|
||||
|
@ -140,7 +140,7 @@ class mod_forum_mod_form extends moodleform_mod {
|
||||
$mform->disabledIf('warnafter', 'blockperiod', 'eq', 0);
|
||||
|
||||
$coursecontext = context_course::instance($COURSE->id);
|
||||
plagiarism_get_form_elements_module($mform, $coursecontext);
|
||||
plagiarism_get_form_elements_module($mform, $coursecontext, 'mod_forum');
|
||||
|
||||
//-------------------------------------------------------------------------------
|
||||
|
||||
|
@ -198,7 +198,7 @@ class mod_workshop_mod_form extends moodleform_mod {
|
||||
$mform->setAdvanced('assessmentend');
|
||||
|
||||
$coursecontext = context_course::instance($this->course->id);
|
||||
plagiarism_get_form_elements_module($mform, $coursecontext);
|
||||
plagiarism_get_form_elements_module($mform, $coursecontext, 'mod_workshop');
|
||||
|
||||
// Common module settings, Restrict availability, Activity completion etc. ----
|
||||
$features = array('groups'=>true, 'groupings'=>true, 'groupmembersonly'=>true,
|
||||
|
@ -57,8 +57,9 @@ class plagiarism_plugin {
|
||||
* hook to add plagiarism specific settings to a module settings page
|
||||
* @param object $mform - Moodle form
|
||||
* @param object $context - current context
|
||||
* @param string $modulename - Name of the module
|
||||
*/
|
||||
public function get_form_elements_module($mform, $context) {
|
||||
public function get_form_elements_module($mform, $context, $modulename = "") {
|
||||
}
|
||||
/* hook to save plagiarism specific settings on a module settings page
|
||||
* @param object $data - data from an mform submission.
|
||||
|
Loading…
x
Reference in New Issue
Block a user