Fix adminarea and emails for new membership logic

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index ca483e2f109..fe39f83b400 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -157,20 +157,20 @@ class NotificationService
     end
   end
 
-  def new_team_member(users_project)
-    mailer.access_level_granted_email(users_project.id)
+  def new_team_member(project_member)
+    mailer.project_access_granted_email(project_member.id)
   end
 
-  def update_team_member(users_project)
-    mailer.access_level_granted_email(users_project.id)
+  def update_team_member(project_member)
+    mailer.project_access_granted_email(project_member.id)
   end
 
   def new_group_member(users_group)
-    mailer.access_level_granted_email(users_group.id)
+    mailer.group_access_granted_email(users_group.id)
   end
 
   def update_group_member(users_group)
-    mailer.access_level_granted_email(users_group.id)
+    mailer.group_access_granted_email(users_group.id)
   end
 
   def project_was_moved(project)
@@ -186,19 +186,19 @@ class NotificationService
 
   # Get project users with WATCH notification level
   def project_watchers(project)
-    project_members = users_project_notification(project)
+    project_members = project_member_notification(project)
 
-    users_with_project_level_global = users_project_notification(project, Notification::N_GLOBAL)
+    users_with_project_level_global = project_member_notification(project, Notification::N_GLOBAL)
     users_with_group_level_global = users_group_notification(project, Notification::N_GLOBAL)
     users = users_with_global_level_watch([users_with_project_level_global, users_with_group_level_global].flatten.uniq)
 
-    users_with_project_setting = select_users_project_setting(project, users_with_project_level_global, users)
+    users_with_project_setting = select_project_member_setting(project, users_with_project_level_global, users)
     users_with_group_setting = select_users_group_setting(project, project_members, users_with_group_level_global, users)
 
     User.where(id: users_with_project_setting.concat(users_with_group_setting).uniq).to_a
   end
 
-  def users_project_notification(project, notification_level=nil)
+  def project_member_notification(project, notification_level=nil)
     project_members = project.project_members
 
     if notification_level
@@ -224,8 +224,8 @@ class NotificationService
   end
 
   # Build a list of users based on project notifcation settings
-  def select_users_project_setting(project, global_setting, users_global_level_watch)
-    users = users_project_notification(project, Notification::N_WATCH)
+  def select_project_member_setting(project, global_setting, users_global_level_watch)
+    users = project_member_notification(project, Notification::N_WATCH)
 
     # If project setting is global, add to watch list if global setting is watch
     global_setting.each do |user_id|