From 8c011667250ddb0c413659c9e9869f44a8134b3e Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Fri, 11 Oct 2024 14:29:53 +0100 Subject: [PATCH] MDL-83443 enrol: use defined role name in welcome message. --- enrol/manual/tests/behat/welcomemessage.feature | 4 ++-- enrol/self/tests/behat/welcomemessage.feature | 4 ++-- lib/enrollib.php | 8 ++------ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/enrol/manual/tests/behat/welcomemessage.feature b/enrol/manual/tests/behat/welcomemessage.feature index 1941dd439f2..26b3ef39555 100644 --- a/enrol/manual/tests/behat/welcomemessage.feature +++ b/enrol/manual/tests/behat/welcomemessage.feature @@ -125,7 +125,7 @@ Feature: A course welcome message will be sent to the user when they are enrolle And I should see "Your email address: first@example.com" And I should see "Your first name: First" And I should see "Your last name: User" - And I should see "Your course role: student" + And I should see "Your course role: Student" # Login as second user and check the notification. When I am on the "C1" "course" page logged in as user2 Then I should see "1" in the "#nav-notification-popover-container [data-region='count-container']" "css_element" @@ -136,4 +136,4 @@ Feature: A course welcome message will be sent to the user when they are enrolle And I should see "Your email address: second@example.com" And I should see "Your first name: Second" And I should see "Your last name: User" - And I should see "Your course role: student" + And I should see "Your course role: Student" diff --git a/enrol/self/tests/behat/welcomemessage.feature b/enrol/self/tests/behat/welcomemessage.feature index 7c6957f0698..6c5562ccac7 100644 --- a/enrol/self/tests/behat/welcomemessage.feature +++ b/enrol/self/tests/behat/welcomemessage.feature @@ -110,7 +110,7 @@ Feature: A course welcome message will be sent to the user when they auto-enrol And I should see "Your email address: first@example.com" And I should see "Your first name: First" And I should see "Your last name: User" - And I should see "Your course role: student" + And I should see "Your course role: Student" # Login as second user and check the notification. And I log in as "user2" And I am on "Course 1" course homepage @@ -123,4 +123,4 @@ Feature: A course welcome message will be sent to the user when they auto-enrol And I should see "Your email address: second@example.com" And I should see "Your first name: Second" And I should see "Your last name: User" - And I should see "Your course role: student" + And I should see "Your course role: Student" diff --git a/lib/enrollib.php b/lib/enrollib.php index 72ebb4bf799..08a724fc509 100644 --- a/lib/enrollib.php +++ b/lib/enrollib.php @@ -3655,11 +3655,7 @@ abstract class enrol_plugin { $context = context_course::instance($instance->courseid); $user = core_user::get_user($userid); $course = get_course($instance->courseid); - $courserole = $DB->get_field( - table: 'role', - return: 'shortname', - conditions: ['id' => $instance->roleid], - ); + $courserole = $DB->get_record('role', ['id' => $instance->roleid]); $a = new stdClass(); $a->coursename = format_string($course->fullname, true, ['context' => $context, 'escape' => false]); @@ -3693,7 +3689,7 @@ abstract class enrol_plugin { $user->email, $user->firstname, $user->lastname, - $courserole, + role_get_name($courserole, $context), ]; $message = str_replace($placeholders, $values, $message); if (strpos($message, '<') === false) {