Merge branch 'MDL-38821_master' of git://github.com/dmonllao/moodle

This commit is contained in:
Dan Poltawski 2013-04-02 19:54:46 +08:00
commit 6842ab4455
4 changed files with 9 additions and 1 deletions

View File

@ -47,6 +47,7 @@ class enrol_cohort_edit_form extends moodleform {
$mform->addElement('header','general', get_string('pluginname', 'enrol_cohort'));
$mform->addElement('text', 'name', get_string('custominstancename', 'enrol'));
$mform->setType('name', PARAM_TEXT);
$options = array(ENROL_INSTANCE_ENABLED => get_string('yes'),
ENROL_INSTANCE_DISABLED => get_string('no'));

View File

@ -63,6 +63,7 @@ class enrol_manual_edit_form extends moodleform {
$mform->disabledIf('expirythreshold', 'expirynotify', 'eq', 0);
$mform->addElement('hidden', 'courseid');
$mform->setType('courseid', PARAM_INT);
$this->add_action_buttons(true, ($instance->id ? null : get_string('addinstance', 'enrol')));

View File

@ -39,6 +39,7 @@ class enrol_paypal_edit_form extends moodleform {
$mform->addElement('header', 'header', get_string('pluginname', 'enrol_paypal'));
$mform->addElement('text', 'name', get_string('custominstancename', 'enrol'));
$mform->setType('name', PARAM_TEXT);
$options = array(ENROL_INSTANCE_ENABLED => get_string('yes'),
ENROL_INSTANCE_DISABLED => get_string('no'));
@ -46,6 +47,7 @@ class enrol_paypal_edit_form extends moodleform {
$mform->setDefault('status', $plugin->get_config('status'));
$mform->addElement('text', 'cost', get_string('cost', 'enrol_paypal'), array('size'=>4));
$mform->setType('cost', PARAM_TEXT);
$mform->setDefault('cost', $plugin->get_config('cost'));
$paypalcurrencies = $plugin->get_currencies();
@ -74,7 +76,10 @@ class enrol_paypal_edit_form extends moodleform {
$mform->addHelpButton('enrolenddate', 'enrolenddate', 'enrol_paypal');
$mform->addElement('hidden', 'id');
$mform->setType('id', PARAM_INT);
$mform->addElement('hidden', 'courseid');
$mform->setType('courseid', PARAM_INT);
$this->add_action_buttons(true, ($instance->id ? null : get_string('addinstance', 'enrol')));
@ -100,4 +105,4 @@ class enrol_paypal_edit_form extends moodleform {
return $errors;
}
}
}

View File

@ -39,6 +39,7 @@ class enrol_self_edit_form extends moodleform {
$mform->addElement('header', 'header', get_string('pluginname', 'enrol_self'));
$mform->addElement('text', 'name', get_string('custominstancename', 'enrol'));
$mform->setType('name', PARAM_TEXT);
$options = array(ENROL_INSTANCE_ENABLED => get_string('yes'),
ENROL_INSTANCE_DISABLED => get_string('no'));