L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-59299 mod_assign: use new filetypes element for accepted file types

Browse Source
This commit is contained in:
Jake Dallimore
2017-07-31 09:58:20 +08:00
committed by John Okely
parent d509f80c48
commit 9069c66e42
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/submission/file/locallib.php
+2 -3
View File
@@ -113,16 +113,15 @@ class assign_submission_file extends assign_submission_plugin {
'notchecked');
$name = get_string('acceptedfiletypes', 'assignsubmission_file');
$mform->addElement('text', 'assignsubmission_file_filetypes', $name, array('size' => '60'));
$mform->addElement('filetypes', 'assignsubmission_file_filetypes', $name);
$mform->addHelpButton('assignsubmission_file_filetypes', 'acceptedfiletypes', 'assignsubmission_file');
$mform->setType('assignsubmission_file_filetypes', PARAM_RAW);
$mform->setDefault('assignsubmission_file_filetypes', $defaultfiletypes);
$mform->disabledIf('assignsubmission_file_filetypes', 'assignsubmission_file_enabled', 'notchecked');
$mform->addFormRule(function ($values, $files) {
if (empty($values['assignsubmission_file_filetypes'])) {
return true;
}
$nonexistent = $this->get_nonexistent_file_types($values['assignsubmission_file_filetypes']);
$nonexistent = $this->get_nonexistent_file_types($values['assignsubmission_file_filetypes']['filetypes']);
if (empty($nonexistent)) {
return true;
} else {
mod/assign/submission/file/settings.php
+2 -2
View File
@@ -32,9 +32,9 @@ $settings->add(new admin_setting_configtext('assignsubmission_file/maxfiles',
new lang_string('maxfiles', 'assignsubmission_file'),
new lang_string('maxfiles_help', 'assignsubmission_file'), 20, PARAM_INT));
$settings->add(new admin_setting_configtext('assignsubmission_file/filetypes',
$settings->add(new admin_setting_filetypes('assignsubmission_file/filetypes',
new lang_string('defaultacceptedfiletypes', 'assignsubmission_file'),
new lang_string('acceptedfiletypes_help', 'assignsubmission_file'), '', PARAM_RAW, 60));
new lang_string('acceptedfiletypes_help', 'assignsubmission_file'), ''));
if (isset($CFG->maxbytes)) {