Browse Source
Merge pull request #91 from joybrusich/bugfixes
Fixes #90 $instance not initiated
SABERES_37_STABLE
Flotter Totte
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
5 additions and
1 deletions
-
lang/en/enrol_apply.php
-
lang/en_us/en_us_enrol_apply.php
-
manage.php
-
renderer.php
|
@ -92,6 +92,7 @@ $string['notification'] = '<b>Enrolment application successfully sent</b>. <br/> |
|
|
$string['mailtoteacher_suject'] = 'New Enrolment request!'; |
|
|
$string['mailtoteacher_suject'] = 'New Enrolment request!'; |
|
|
$string['editdescription'] = 'Textarea description'; |
|
|
$string['editdescription'] = 'Textarea description'; |
|
|
$string['comment'] = 'Comment'; |
|
|
$string['comment'] = 'Comment'; |
|
|
|
|
|
$string['applycomment'] = 'Comment'; |
|
|
$string['applymanage'] = 'Manage enrolment applications'; |
|
|
$string['applymanage'] = 'Manage enrolment applications'; |
|
|
|
|
|
|
|
|
$string['status_desc'] = 'Allow course access of internally enrolled users.'; |
|
|
$string['status_desc'] = 'Allow course access of internally enrolled users.'; |
|
|
|
@ -57,6 +57,7 @@ $string['sendmailtomanager'] = 'Send email notification to managers'; |
|
|
$string['mailtoteacher_suject'] = 'New enrollment request!'; |
|
|
$string['mailtoteacher_suject'] = 'New enrollment request!'; |
|
|
$string['editdescription'] = 'Textarea description'; |
|
|
$string['editdescription'] = 'Textarea description'; |
|
|
$string['comment'] = 'Comment'; |
|
|
$string['comment'] = 'Comment'; |
|
|
|
|
|
$string['applycomment'] = 'Comment'; |
|
|
$string['applymanage'] = 'Manage enrollment applications'; |
|
|
$string['applymanage'] = 'Manage enrollment applications'; |
|
|
|
|
|
|
|
|
$string['status_desc'] = 'Allow course access of internally enrolled users.'; |
|
|
$string['status_desc'] = 'Allow course access of internally enrolled users.'; |
|
|
|
@ -38,6 +38,7 @@ if ($id == null) { |
|
|
$context = context_system::instance(); |
|
|
$context = context_system::instance(); |
|
|
require_capability('enrol/apply:manageapplications', $context); |
|
|
require_capability('enrol/apply:manageapplications', $context); |
|
|
$pageheading = get_string('confirmusers', 'enrol_apply'); |
|
|
$pageheading = get_string('confirmusers', 'enrol_apply'); |
|
|
|
|
|
$instance = null; |
|
|
} else { |
|
|
} else { |
|
|
$instance = $DB->get_record('enrol', array('id' => $id, 'enrol' => 'apply'), '*', MUST_EXIST); |
|
|
$instance = $DB->get_record('enrol', array('id' => $id, 'enrol' => 'apply'), '*', MUST_EXIST); |
|
|
require_course_login($instance->courseid); |
|
|
require_course_login($instance->courseid); |
|
|
|
@ -91,7 +91,8 @@ class enrol_apply_renderer extends plugin_renderer_base { |
|
|
'fullname', // Magic happens here: The column heading will automatically be set due to column name 'fullname'. |
|
|
'fullname', // Magic happens here: The column heading will automatically be set due to column name 'fullname'. |
|
|
get_string('email'), |
|
|
get_string('email'), |
|
|
get_string('applydate', 'enrol_apply'), |
|
|
get_string('applydate', 'enrol_apply'), |
|
|
$instance->customtext2); |
|
|
get_string('applycomment', 'enrol_apply'), |
|
|
|
|
|
); |
|
|
$table->define_columns($columns); |
|
|
$table->define_columns($columns); |
|
|
$table->define_headers($headers); |
|
|
$table->define_headers($headers); |
|
|
|
|
|
|
|
|