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

Merge branch 'MDL-37621-master-fix2' of git://github.com/damyon/moodle

Browse Source
This commit is contained in:
Marina Glancy
2013-06-12 17:22:22 +10:00
parent 128e9315d6 c7cd8d9c84
commit 8ea7d3a2db
5 changed files with 67 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adminlib.php
+40
View File
@@ -2285,6 +2285,46 @@ if (is_ie) {
}
}
/**
* Empty setting used to allow flags (advanced) on settings that can have no sensible default.
* Note: Only advanced makes sense right now - locked does not.
*
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class admin_setting_configempty extends admin_setting_configtext {
/**
* @param string $name
* @param string $visiblename
* @param string $description
*/
public function __construct($name, $visiblename, $description) {
parent::__construct($name, $visiblename, $description, '', PARAM_RAW);
}
/**
* Returns an XHTML string for the hidden field
*
* @param string $data
* @param string $query
* @return string XHTML string for the editor
*/
public function output_html($data, $query='') {
return format_admin_setting($this,
$this->visiblename,
'<div class="form-empty" >' .
'<input type="hidden"' .
' id="'. $this->get_id() .'"' .
' name="'. $this->get_full_name() .'"' .
' value=""/></div>',
$this->description,
true,
'',
get_string('none'),
$query);
}
}
/**
* Path to directory
mod/assign/lang/en/assign.php
+1 -3
View File
@@ -278,9 +278,7 @@ $string['quickgradingresult'] = 'Quick grading';
$string['quickgradingchangessaved'] = 'The grade changes were saved';
$string['quickgrading_help'] = 'Quick grading allows you to assign grades (and outcomes) directly in the submissions table. Quick grading is not compatible with advanced grading and is not recommended when there are multiple markers.';
$string['requiresubmissionstatement'] = 'Require that students accept the submission statement';
$string['requiresubmissionstatement_help'] = 'Require that students accept the submission statement for all assignment submissions for this entire Moodle installation. If this setting is not enabled, then submission statements can be enabled or disabled in the settings for each assignment.';
$string['requiresubmissionstatementassignment'] = 'Require that students accept the submission statement';
$string['requiresubmissionstatementassignment_help'] = 'Require that students accept the submission statement for all submissions to this assignment.';
$string['requiresubmissionstatement_help'] = 'Require that students accept the submission statement for all submissions to this assignment.';
$string['requireallteammemberssubmit'] = 'Require all group members submit';
$string['requireallteammemberssubmit_help'] = 'If enabled, all members of the student group must click the submit button for this assignment before the group submission will be considered as submitted. If disabled, the group submission will be considered as submitted as soon as any member of the student group clicks the submit button.';
$string['recordid'] = 'Identifier';
mod/assign/locallib.php
+3 -6
View File
@@ -3425,8 +3425,7 @@ class assign {
$data = new stdClass();
$adminconfig = $this->get_admin_config();
$requiresubmissionstatement = (!empty($adminconfig->requiresubmissionstatement) ||
$this->get_instance()->requiresubmissionstatement) &&
$requiresubmissionstatement = $this->get_instance()->requiresubmissionstatement &&
!empty($adminconfig->submissionstatement);
$submissionstatement = '';
@@ -4412,8 +4411,7 @@ class assign {
$instance = $this->get_instance();
$data = new stdClass();
$adminconfig = $this->get_admin_config();
$requiresubmissionstatement = (!empty($adminconfig->requiresubmissionstatement) ||
$instance->requiresubmissionstatement) &&
$requiresubmissionstatement = $instance->requiresubmissionstatement &&
!empty($adminconfig->submissionstatement);
$submissionstatement = '';
@@ -5485,8 +5483,7 @@ class assign {
// Submission statement.
$adminconfig = $this->get_admin_config();
$requiresubmissionstatement = (!empty($adminconfig->requiresubmissionstatement) ||
$this->get_instance()->requiresubmissionstatement) &&
$requiresubmissionstatement = $this->get_instance()->requiresubmissionstatement &&
!empty($adminconfig->submissionstatement);
$draftsenabled = $this->get_instance()->submissiondrafts;
mod/assign/mod_form.php
+5 -11
View File
@@ -103,17 +103,11 @@ class mod_assign_mod_form extends moodleform_mod {
$mform->addElement('selectyesno', 'submissiondrafts', $name);
$mform->addHelpButton('submissiondrafts', 'submissiondrafts', 'assign');
if (empty($config->submissionstatement)) {
$mform->addElement('hidden', 'requiresubmissionstatement', 0);
} else if (empty($config->requiresubmissionstatement)) {
$name = get_string('requiresubmissionstatement', 'assign');
$mform->addElement('selectyesno', 'requiresubmissionstatement', $name);
$mform->addHelpButton('requiresubmissionstatement',
'requiresubmissionstatementassignment',
'assign');
} else {
$mform->addElement('hidden', 'requiresubmissionstatement', 1);
}
$name = get_string('requiresubmissionstatement', 'assign');
$mform->addElement('selectyesno', 'requiresubmissionstatement', $name);
$mform->addHelpButton('requiresubmissionstatement',
'requiresubmissionstatement',
'assign');
$mform->setType('requiresubmissionstatement', PARAM_BOOL);
$options = array(
mod/assign/settings.php
+18 -10
View File
@@ -79,13 +79,6 @@ if ($ADMIN->fulltree) {
$description,
$default));
$name = new lang_string('requiresubmissionstatement', 'mod_assign');
$description = new lang_string('requiresubmissionstatement_help', 'mod_assign');
$settings->add(new admin_setting_configcheckbox('assign/requiresubmissionstatement',
$name,
$description,
0));
$name = new lang_string('defaultsettings', 'mod_assign');
$description = new lang_string('defaultsettings_help', 'mod_assign');
$settings->add(new admin_setting_heading('defaultsettings', $name, $description));
@@ -108,7 +101,6 @@ if ($ADMIN->fulltree) {
0);
$setting->set_enabled_flag_options(admin_setting_flag::ENABLED, true);
$setting->set_advanced_flag_options(admin_setting_flag::ENABLED, false);
$setting->set_locked_flag_options(admin_setting_flag::ENABLED, false);
$settings->add($setting);
$name = new lang_string('duedate', 'mod_assign');
@@ -119,7 +111,6 @@ if ($ADMIN->fulltree) {
604800);
$setting->set_enabled_flag_options(admin_setting_flag::ENABLED, true);
$setting->set_advanced_flag_options(admin_setting_flag::ENABLED, false);
$setting->set_locked_flag_options(admin_setting_flag::ENABLED, false);
$settings->add($setting);
$name = new lang_string('cutoffdate', 'mod_assign');
@@ -130,7 +121,6 @@ if ($ADMIN->fulltree) {
1209600);
$setting->set_enabled_flag_options(admin_setting_flag::ENABLED, false);
$setting->set_advanced_flag_options(admin_setting_flag::ENABLED, false);
$setting->set_locked_flag_options(admin_setting_flag::ENABLED, false);
$settings->add($setting);
$name = new lang_string('submissiondrafts', 'mod_assign');
@@ -143,6 +133,16 @@ if ($ADMIN->fulltree) {
$setting->set_locked_flag_options(admin_setting_flag::ENABLED, false);
$settings->add($setting);
$name = new lang_string('requiresubmissionstatement', 'mod_assign');
$description = new lang_string('requiresubmissionstatement_help', 'mod_assign');
$setting = new admin_setting_configcheckbox('assign/requiresubmissionstatement',
$name,
$description,
0);
$setting->set_advanced_flag_options(admin_setting_flag::ENABLED, false);
$setting->set_locked_flag_options(admin_setting_flag::ENABLED, false);
$settings->add($setting);
// Constants from locallib.php
$options = array(
'none' => get_string('attemptreopenmethod_none', 'mod_assign'),
@@ -194,6 +194,14 @@ if ($ADMIN->fulltree) {
$setting->set_locked_flag_options(admin_setting_flag::ENABLED, false);
$settings->add($setting);
$name = new lang_string('teamsubmissiongroupingid', 'mod_assign');
$description = new lang_string('teamsubmissiongroupingid_help', 'mod_assign');
$setting = new admin_setting_configempty('assign/teamsubmissiongroupingid',
$name,
$description);
$setting->set_advanced_flag_options(admin_setting_flag::ENABLED, false);
$settings->add($setting);
$name = new lang_string('sendnotifications', 'mod_assign');
$description = new lang_string('sendnotifications_help', 'mod_assign');
$setting = new admin_setting_configcheckbox('assign/sendnotifications',