Merge branch 'MDL-34645_22' of git://github.com/aolley/moodle into MOODLE_22_STABLE

2012-08-06 11:04:47 +12:00
parent f5543aa05e aef7e750b0
commit 07d8e5cfa7
1 changed files with 2 additions and 0 deletions
@@ -215,6 +215,7 @@ class enrol_manual_plugin extends enrol_plugin {
        $today = time();
        $today = make_timestamp(date('Y', $today), date('m', $today), date('d', $today), 0, 0, 0);
        $startdateoptions[3] = get_string('today') . ' (' . userdate($today, $timeformat) . ')' ;
+        $defaultduration = $instance->enrolperiod > 0 ? $instance->enrolperiod / 86400 : '';

        $modules = array('moodle-enrol_manual-quickenrolment', 'moodle-enrol_manual-quickenrolment-skin');
        $arguments = array(
@@ -224,6 +225,7 @@ class enrol_manual_plugin extends enrol_plugin {
            'url'                 => $manager->get_moodlepage()->url->out(false),
            'optionsStartDate'    => $startdateoptions,
            'defaultRole'         => $instance->roleid,
+            'defaultDuration'     => $defaultduration,
            'disableGradeHistory' => $CFG->disablegradehistory
        );
        $function = 'M.enrol_manual.quickenrolment.init';