Skip to content
Permalink
Browse files

Merge branch 'w33_MDL-34852_m24_enroledit' of git://github.com/skodak…

…/moodle
  • Loading branch information...
Aparup Banerjee
Aparup Banerjee committed Aug 13, 2012
2 parents 2b1ddbb + 4c04933 commit b039a627b2c7444320b3abe04b8d18bcd21a74ef
Showing with 11 additions and 4 deletions.
  1. +5 −2 enrol/manual/editenrolment_form.php
  2. +5 −2 enrol/self/editenrolment_form.php
  3. +1 −0 lang/en/enrol.php
@@ -46,9 +46,12 @@ function definition() {
$mform->addElement('select', 'status', get_string('participationstatus', 'enrol'), $options);
}
$mform->addElement('date_selector', 'timestart', get_string('enroltimestart', 'enrol'), array('optional' => true));
$mform->addElement('date_time_selector', 'timestart', get_string('enroltimestart', 'enrol'), array('optional' => true));
$mform->addElement('date_selector', 'timeend', get_string('enroltimeend', 'enrol'), array('optional' => true));
$mform->addElement('date_time_selector', 'timeend', get_string('enroltimeend', 'enrol'), array('optional' => true));
$mform->addElement('date_time_selector', 'timecreated', get_string('enroltimecreated', 'enrol'));
$mform->hardFreeze('timecreated');
$mform->addElement('hidden', 'ue');
$mform->setType('ue', PARAM_INT);
@@ -46,9 +46,12 @@ function definition() {
$mform->addElement('select', 'status', get_string('participationstatus', 'enrol'), $options);
}
$mform->addElement('date_selector', 'timestart', get_string('enroltimestart', 'enrol'), array('optional' => true));
$mform->addElement('date_time_selector', 'timestart', get_string('enroltimestart', 'enrol'), array('optional' => true));
$mform->addElement('date_selector', 'timeend', get_string('enroltimeend', 'enrol'), array('optional' => true));
$mform->addElement('date_time_selector', 'timeend', get_string('enroltimeend', 'enrol'), array('optional' => true));
$mform->addElement('date_time_selector', 'timecreated', get_string('enroltimecreated', 'enrol'));
$mform->hardFreeze('timecreated');
$mform->addElement('hidden', 'ue');
$mform->setType('ue', PARAM_INT);
@@ -55,6 +55,7 @@
$string['enrolperiod'] = 'Enrolment duration';
$string['enrolusage'] = 'Instances / enrolments';
$string['enrolusers'] = 'Enrol users';
$string['enroltimecreated'] = 'Enrolment created';
$string['enroltimeend'] = 'Enrolment ends';
$string['enroltimestart'] = 'Enrolment starts';
$string['errajaxfailedenrol'] = 'Failed to enrol user';

0 comments on commit b039a62

Please sign in to comment.
You can’t perform that action at this time.