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

Merge branch 'MDL-45843-master-fix1' of http://github.com/damyon/moodle

Browse source
This commit is contained in:
Dan Poltawski 2014-10-17 09:34:39 +01:00
commit bef6e88b5d
3 changed files with 7 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/lti/edit_form.php
View file

@ -58,7 +58,7 @@ class mod_lti_edit_types_form extends moodleform{
$mform =& $this->_form; $mform =& $this->_form;
$istool = $this->_customdata->istool; $istool = $this->_customdata && $this->_customdata->istool;
// Add basiclti elements. // Add basiclti elements.
$mform->addElement('header', 'setup', get_string('tool_settings', 'lti')); $mform->addElement('header', 'setup', get_string('tool_settings', 'lti'));

21
mod/lti/register_form.php
View file

@ -50,16 +50,18 @@ class mod_lti_register_types_form extends moodleform {
// Tool Provider name. // Tool Provider name.
$strrequired = get_string('required');
$mform->addElement('text', 'lti_registrationname', get_string('registrationname', 'lti')); $mform->addElement('text', 'lti_registrationname', get_string('registrationname', 'lti'));
$mform->setType('lti_registrationname', PARAM_TEXT); $mform->setType('lti_registrationname', PARAM_TEXT);
$mform->addHelpButton('lti_registrationname', 'registrationname', 'lti'); $mform->addHelpButton('lti_registrationname', 'registrationname', 'lti');
$mform->addRule('lti_registrationname', null, 'required', null, 'client'); $mform->addRule('lti_registrationname', $strrequired, 'required', null, 'client');
// Registration URL. // Registration URL.
$mform->addElement('text', 'lti_registrationurl', get_string('registrationurl', 'lti'), array('size' => '64')); $mform->addElement('text', 'lti_registrationurl', get_string('registrationurl', 'lti'), array('size' => '64'));
$mform->setType('lti_registrationurl', PARAM_TEXT); $mform->setType('lti_registrationurl', PARAM_URL);
$mform->addHelpButton('lti_registrationurl', 'registrationurl', 'lti'); $mform->addHelpButton('lti_registrationurl', 'registrationurl', 'lti');
$mform->addRule('lti_registrationurl', $strrequired, 'required', null, 'client');
// LTI Capabilities. // LTI Capabilities.
@ -70,6 +72,7 @@ class mod_lti_register_types_form extends moodleform {
array_combine($options, $options), $attributes); array_combine($options, $options), $attributes);
$mform->setType('lti_capabilities', PARAM_TEXT); $mform->setType('lti_capabilities', PARAM_TEXT);
$mform->addHelpButton('lti_capabilities', 'capabilities', 'lti'); $mform->addHelpButton('lti_capabilities', 'capabilities', 'lti');
$mform->addRule('lti_capabilities', $strrequired, 'required', null, 'client');
// LTI Services. // LTI Services.
@ -82,6 +85,7 @@ class mod_lti_register_types_form extends moodleform {
$mform->addElement('select', 'lti_services', get_string('services', 'lti'), $options, $attributes); $mform->addElement('select', 'lti_services', get_string('services', 'lti'), $options, $attributes);
$mform->setType('lti_services', PARAM_TEXT); $mform->setType('lti_services', PARAM_TEXT);
$mform->addHelpButton('lti_services', 'services', 'lti'); $mform->addHelpButton('lti_services', 'services', 'lti');
$mform->addRule('lti_services', $strrequired, 'required', null, 'client');
$mform->addElement('hidden', 'toolproxyid'); $mform->addElement('hidden', 'toolproxyid');
$mform->setType('toolproxyid', PARAM_INT); $mform->setType('toolproxyid', PARAM_INT);
@ -97,7 +101,6 @@ class mod_lti_register_types_form extends moodleform {
// Add standard buttons, common to all modules. // Add standard buttons, common to all modules.
$this->add_action_buttons(); $this->add_action_buttons();
} }
/** /**
@ -112,16 +115,4 @@ class mod_lti_register_types_form extends moodleform {
$mform->disabledIf('lti_services', null); $mform->disabledIf('lti_services', null);
} }
/**
* Set up rules for required fields.
*/
public function required_fields() {
$mform =& $this->_form;
$mform->addRule('lti_registrationurl', null, 'required', null, 'client');
}
} }

4
mod/lti/registersettings.php
View file

@ -81,11 +81,7 @@ if ($form->is_cancelled()) {
$form->set_data($toolproxy); $form->set_data($toolproxy);
if ($toolproxy->state == LTI_TOOL_PROXY_STATE_ACCEPTED) { if ($toolproxy->state == LTI_TOOL_PROXY_STATE_ACCEPTED) {
$form->disable_fields(); $form->disable_fields();
} else {
$form->required_fields();
} }
} else {
$form->required_fields();
} }
$form->display(); $form->display();