mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

MDL-44725 Availability: Replace groupmembersonly - forms (4)

Browse Source 
Remove groupmembersonly option from module editing forms.
This commit is contained in:
sam marshall 2014-08-01 17:13:05 +01:00
parent dea081af23
commit 4717a5fca6
4 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
course/modedit.php
View File

@ -73,7 +73,6 @@ if (!empty($add)) {
$data->modulename = $module->name;
$data->groupmode = $course->groupmode;
$data->groupingid = $course->defaultgroupingid;
$data->groupmembersonly = 0;
$data->id = '';
$data->instance = '';
$data->coursemodule = '';
@ -146,7 +145,6 @@ if (!empty($add)) {
$data->cmidnumber = $cm->idnumber; // The cm IDnumber
$data->groupmode = groups_get_activity_groupmode($cm); // locked later if forced
$data->groupingid = $cm->groupingid;
$data->groupmembersonly = $cm->groupmembersonly;
$data->course = $course->id;
$data->module = $module->id;
$data->modulename = $module->name;

8
course/modlib.php
View File

@ -66,7 +66,6 @@ function add_moduleinfo($moduleinfo, $course, $mform = null) {
}
$newcm->groupmode = $moduleinfo->groupmode;
$newcm->groupingid = $moduleinfo->groupingid;
$newcm->groupmembersonly = $moduleinfo->groupmembersonly;
$completion = new completion_info($course);
if ($completion->is_enabled()) {
$newcm->completion = $moduleinfo->completion;
@ -358,10 +357,6 @@ function set_moduleinfo_defaults($moduleinfo) {
$moduleinfo->groupingid = 0;
}
if (!isset($moduleinfo->groupmembersonly)) {
$moduleinfo->groupmembersonly = 0;
}
if (!isset($moduleinfo->name)) { // Label.
$moduleinfo->name = $moduleinfo->modulename;
}
@ -477,9 +472,6 @@ function update_moduleinfo($cm, $moduleinfo, $course, $mform = null) {
if (isset($moduleinfo->groupingid)) {
$cm->groupingid = $moduleinfo->groupingid;
}
if (isset($moduleinfo->groupmembersonly)) {
$cm->groupmembersonly = $moduleinfo->groupmembersonly;
}
$completion = new completion_info($course);
if ($completion->is_enabled() && !empty($moduleinfo->completionunlocked)) {

19
course/moodleform_mod.php
View File

@ -92,7 +92,6 @@ abstract class moodleform_mod extends moodleform {
$this->_features = new stdClass();
$this->_features->groups = plugin_supports('mod', $this->_modname, FEATURE_GROUPS, true);
$this->_features->groupings = plugin_supports('mod', $this->_modname, FEATURE_GROUPINGS, false);
$this->_features->groupmembersonly = (!empty($CFG->enablegroupmembersonly) and plugin_supports('mod', $this->_modname, FEATURE_GROUPMEMBERSONLY, false));
$this->_features->outcomes = (!empty($CFG->enableoutcomes) and plugin_supports('mod', $this->_modname, FEATURE_GRADE_OUTCOMES, true));
$this->_features->hasgrades = plugin_supports('mod', $this->_modname, FEATURE_GRADE_HAS_GRADE, false);
$this->_features->idnumber = plugin_supports('mod', $this->_modname, FEATURE_IDNUMBER, true);
@ -192,14 +191,11 @@ abstract class moodleform_mod extends moodleform {
// otherwise you cannot turn it off at same time as turning off other
// option (MDL-30764)
if (empty($this->_cm) || !$this->_cm->groupingid) {
if ($mform->elementExists('groupmode') and !$mform->elementExists('groupmembersonly') and empty($COURSE->groupmodeforce)) {
if ($mform->elementExists('groupmode') && empty($COURSE->groupmodeforce)) {
$mform->disabledIf('groupingid', 'groupmode', 'eq', NOGROUPS);
} else if (!$mform->elementExists('groupmode') and $mform->elementExists('groupmembersonly')) {
$mform->disabledIf('groupingid', 'groupmembersonly', 'notchecked');
} else if (!$mform->elementExists('groupmode') and !$mform->elementExists('groupmembersonly')) {
// groupings have no use without groupmode or groupmembersonly
} else if (!$mform->elementExists('groupmode')) {
// Groupings have no use without groupmode.
if ($mform->elementExists('groupingid')) {
$mform->removeElement('groupingid');
}
@ -417,8 +413,8 @@ abstract class moodleform_mod extends moodleform {
$mform->addHelpButton('groupmode', 'groupmode', 'group');
}
if ($this->_features->groupings or $this->_features->groupmembersonly) {
//groupings selector - used for normal grouping mode or also when restricting access with groupmembersonly
if ($this->_features->groupings) {
// Groupings selector - used to select grouping for groups in activity.
$options = array();
if ($groupings = $DB->get_records('groupings', array('courseid'=>$COURSE->id))) {
foreach ($groupings as $grouping) {
@ -431,11 +427,6 @@ abstract class moodleform_mod extends moodleform {
$mform->addHelpButton('groupingid', 'grouping', 'group');
}
if ($this->_features->groupmembersonly) {
$mform->addElement('checkbox', 'groupmembersonly', get_string('groupmembersonly', 'group'));
$mform->addHelpButton('groupmembersonly', 'groupmembersonly', 'group');
}
if (!empty($CFG->enableavailability)) {
// Availability field. This is just a textarea; the user interface
// interaction is all implemented in JavaScript.

3
lang/en/group.php
View File

@ -101,9 +101,6 @@ $string['groupingsonly'] = 'Groupings only';
$string['groupmember'] = 'Group member';
$string['groupmemberdesc'] = 'Standard role for a member of a group.';
$string['groupmembers'] = 'Group members';
$string['groupmembersonly'] = 'Available for group members only';
$string['groupmembersonly_help'] = 'If this checkbox is ticked, the activity (or resource) will only be available to students assigned to groups within the selected grouping.';
$string['groupmembersonlyerror'] = 'Sorry, you must be member of at least one group that is used in this activity.';
$string['groupmemberssee'] = 'See group members';
$string['groupmembersselected'] = 'Members of selected group';
$string['groupmode'] = 'Group mode';