Add method to return the user notification setting for a group, or a project

2 files changed, 5 insertions, 1 deletions

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 39f436f6f4e..3768efe142a 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -105,7 +105,7 @@ class ProjectsController < Projects::ApplicationController
           @membership = @project.team.find_member(current_user.id)
 
           if @membership
-            @notification_setting = current_user.notification_settings.find_or_initialize_by(source: @project)
+            @notification_setting = current_user.notification_settings_for(@project)
           end
         end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index f68379fd050..031315debd7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -831,6 +831,10 @@ class User < ActiveRecord::Base
     end
   end
 
+  def notification_settings_for(source)
+    notification_settings.find_or_initialize_by(source: source)
+  end
+
   private
 
   def projects_union