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

MDL-47761 enrol: Show more detail for self-enrolment errors

Browse source 
Thanks to Mirko Otto for the solution
This commit is contained in:
John Okely 2015-01-05 14:52:54 +08:00
parent e653b9a469
commit cf6d62fc3f
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
enrol/self/lib.php
View file

@ -248,6 +248,8 @@ class enrol_self_plugin extends enrol_plugin {
$form->display(); $form->display();
$output = ob_get_clean(); $output = ob_get_clean();
return $OUTPUT->box($output); return $OUTPUT->box($output);
} else {
return $OUTPUT->box($enrolstatus);
} }
} }
@ -265,7 +267,7 @@ class enrol_self_plugin extends enrol_plugin {
if ($checkuserenrolment) { if ($checkuserenrolment) {
if (isguestuser()) { if (isguestuser()) {
// Can not enrol guest. // Can not enrol guest.
return get_string('canntenrol', 'enrol_self'); return get_string('noguestaccess', 'enrol');
} }
// Check if user is already enroled. // Check if user is already enroled.
if ($DB->get_record('user_enrolments', array('userid' => $USER->id, 'enrolid' => $instance->id))) { if ($DB->get_record('user_enrolments', array('userid' => $USER->id, 'enrolid' => $instance->id))) {

2
enrol/self/tests/self_test.php
View file

@ -602,7 +602,7 @@ class enrol_self_testcase extends advanced_testcase {
$selfplugin->enrol_user($instance1, $user2->id, $editingteacherrole->id); $selfplugin->enrol_user($instance1, $user2->id, $editingteacherrole->id);
$this->setUser($guest); $this->setUser($guest);
$this->assertSame($expectederrorstring, $selfplugin->can_self_enrol($instance1, true)); $this->assertSame(get_string('noguestaccess', 'enrol'), $selfplugin->can_self_enrol($instance1, true));
$this->setUser($user1); $this->setUser($user1);
$this->assertTrue($selfplugin->can_self_enrol($instance1, true)); $this->assertTrue($selfplugin->can_self_enrol($instance1, true));