moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

user selector: MDL-16966 Properly preserce the enrolment start option through page reloads.

Browse source
This commit is contained in:
tjhunt 2008-11-06 05:54:46 +00:00
parent e98c64a6e1
commit fcaa214b6e
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
admin/roles/assign.php
View file

@ -15,7 +15,7 @@
$courseid = optional_param('courseid', 0, PARAM_INT); // needed for user tabs $courseid = optional_param('courseid', 0, PARAM_INT); // needed for user tabs
$hidden = optional_param('hidden', 0, PARAM_BOOL); // whether this assignment is hidden $hidden = optional_param('hidden', 0, PARAM_BOOL); // whether this assignment is hidden
$extendperiod = optional_param('extendperiod', 0, PARAM_INT); $extendperiod = optional_param('extendperiod', 0, PARAM_INT);
$extendbase = optional_param('extendbase', 0, PARAM_INT); $extendbase = optional_param('extendbase', 3, PARAM_INT);
$baseurl = $CFG->wwwroot . '/' . $CFG->admin . '/roles/assign.php?contextid=' . $contextid; $baseurl = $CFG->wwwroot . '/' . $CFG->admin . '/roles/assign.php?contextid=' . $contextid;
if (!empty($userid)) { if (!empty($userid)) {
@ -103,7 +103,7 @@
// MDL-12420, preventing course start date showing up as an option at system context and front page roles. // MDL-12420, preventing course start date showing up as an option at system context and front page roles.
if ($course->startdate > 0) { if ($course->startdate > 0) {
$basemenu[0] = get_string('coursestart') . ' (' . userdate($course->startdate, $timeformat) . ')'; $basemenu[2] = get_string('coursestart') . ' (' . userdate($course->startdate, $timeformat) . ')';
} }
if ($course->enrollable != 2 || ($course->enrolstartdate == 0 || $course->enrolstartdate <= $today) && ($course->enrolenddate == 0 || $course->enrolenddate > $today)) { if ($course->enrollable != 2 || ($course->enrolstartdate == 0 || $course->enrolstartdate <= $today) && ($course->enrolenddate == 0 || $course->enrolenddate > $today)) {
$basemenu[3] = get_string('today') . ' (' . userdate($today, $timeformat) . ')' ; $basemenu[3] = get_string('today') . ' (' . userdate($today, $timeformat) . ')' ;
@ -116,12 +116,6 @@
$basemenu[5] = get_string('courseenrolend') . ' (' . userdate($course->enrolenddate, $timeformat) . ')'; $basemenu[5] = get_string('courseenrolend') . ' (' . userdate($course->enrolenddate, $timeformat) . ')';
} }
} }
/// Work out the apropriate default setting.
if ($extendbase) {
$defaultbase = $extendbase;
} else {
$defaultbase = 3;
}
/// Process any incoming role assignments before printing the header. /// Process any incoming role assignments before printing the header.
if ($roleid) { if ($roleid) {
@ -162,7 +156,7 @@
if ($allow) { if ($allow) {
switch($extendbase) { switch($extendbase) {
case 0: case 2:
$timestart = $course->startdate; $timestart = $course->startdate;
break; break;
case 3: case 3:
@ -312,10 +306,10 @@
</label></p> </label></p>
<p><label for="extendperiod"><?php print_string('enrolperiod') ?></label><br /> <p><label for="extendperiod"><?php print_string('enrolperiod') ?></label><br />
<?php choose_from_menu($periodmenu, "extendperiod", $defaultperiod, $unlimitedperiod); ?></p> <?php choose_from_menu($periodmenu, 'extendperiod', $defaultperiod, $unlimitedperiod); ?></p>
<p><label for="extendbase"><?php print_string('startingfrom') ?></label><br /> <p><label for="extendbase"><?php print_string('startingfrom') ?></label><br />
<?php choose_from_menu($basemenu, "extendbase", $defaultbase, ""); ?></p> <?php choose_from_menu($basemenu, 'extendbase', $extendbase, ''); ?></p>
<?php print_collapsible_region_end(); ?> <?php print_collapsible_region_end(); ?>
</div> </div>