From 7e7e558fd00be85b98c2c98a2953c29bdec06a0c Mon Sep 17 00:00:00 2001
From: John Pinto <jpinto@newington.ed.ac.uk>
Date: Mon, 25 Oct 2021 12:05:40 +0100
Subject: [PATCH] Issue #2955 -  UserMailer#permissions_change_notification
 receives incorrect user

Changes:
 - Added an instance variable @recepient = @role.user to
permissions_change_notification() method in roles_controller and removed
instance variable @username and replaced @role.user.email by
@recepient.email.
 - Replaced username with recepientname = @recepient.name in permissions_change_notification.html.erb
---
 app/mailers/user_mailer.rb                                    | 4 ++--
 .../user_mailer/permissions_change_notification.html.erb      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 86a52ad1dc..13dcf11d63 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -68,11 +68,11 @@ def permissions_change_notification(role, user)
     @role       = role
     @plan_title = @role.plan.title
     @user       = user
-    @username   = @user.name
+    @recepient   = @role.user
     @messaging  = role_text(@role)
 
     I18n.with_locale I18n.default_locale do
-      mail(to: @role.user.email,
+      mail(to: @recepient.email,
            subject: _("Changed permissions on a Data Management Plan in %{tool_name}") %
            {
              tool_name: tool_name
diff --git a/app/views/user_mailer/permissions_change_notification.html.erb b/app/views/user_mailer/permissions_change_notification.html.erb
index c4d5d2efc5..5a66cd22a3 100644
--- a/app/views/user_mailer/permissions_change_notification.html.erb
+++ b/app/views/user_mailer/permissions_change_notification.html.erb
@@ -1,5 +1,5 @@
 <p>
-  <%= _('Hello %{username}') %{ username: @username } %>
+  <%= _('Hello %{recepientname}') %{ recepientname: @recepient.name } %>
 </p>
 <p>
   <%= _('Your permissions relating to %{plan_title} have changed. You now have %{type} access. This means you can %{placeholder1} %{placeholder2}') % {