Re-use notifications dropdown on user profile

4 files changed, 37 insertions, 52 deletions

diff --git a/app/controllers/groups/notification_settings_controller.rb b/app/controllers/groups/notification_settings_controller.rb
deleted file mode 100644
index de13b16ccf2..00000000000
--- a/app/controllers/groups/notification_settings_controller.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-class Groups::NotificationSettingsController < Groups::ApplicationController
-  before_action :authenticate_user!
-
-  def update
-    notification_setting = current_user.notification_settings_for(group)
-    saved = notification_setting.update_attributes(notification_setting_params)
-
-    render json: { saved: saved }
-  end
-
-  private
-
-  def notification_setting_params
-    params.require(:notification_setting).permit(:level)
-  end
-end
diff --git a/app/controllers/notification_settings_controller.rb b/app/controllers/notification_settings_controller.rb
new file mode 100644
index 00000000000..5d425ad8420
--- /dev/null
+++ b/app/controllers/notification_settings_controller.rb
@@ -0,0 +1,34 @@
+class NotificationSettingsController < ApplicationController
+  before_action :authenticate_user!
+
+  def create
+    project = current_user.projects.find(params[:project][:id])
+
+    @notification_setting = current_user.notification_settings_for(project)
+    @saved = @notification_setting.update_attributes(notification_setting_params)
+
+    render_response
+  end
+
+  def update
+    @notification_setting = current_user.notification_settings.find(params[:id])
+    @saved = @notification_setting.update_attributes(notification_setting_params)
+
+    render_response
+  end
+
+  private
+
+  def render_response
+    render json: {
+      html: view_to_html_string("notifications/buttons/_notifications", notification_setting: @notification_setting),
+      saved: @saved
+    }
+  end
+
+  def notification_setting_params
+    allowed_fields = NotificationSetting::EMAIL_EVENTS.dup
+    allowed_fields << :level
+    params.require(:notification_setting).permit(allowed_fields)
+  end
+end
diff --git a/app/controllers/profiles/notifications_controller.rb b/app/controllers/profiles/notifications_controller.rb
index 40d1906a53f..b8b71d295f6 100644
--- a/app/controllers/profiles/notifications_controller.rb
+++ b/app/controllers/profiles/notifications_controller.rb
@@ -1,13 +1,13 @@
 class Profiles::NotificationsController < Profiles::ApplicationController
   def show
     @user                        = current_user
-    @group_notifications         = current_user.notification_settings.for_groups
-    @project_notifications       = current_user.notification_settings.for_projects
+    @group_notifications         = current_user.notification_settings.for_groups.order(:id)
+    @project_notifications       = current_user.notification_settings.for_projects.order(:id)
     @global_notification_setting = current_user.global_notification_setting
   end
 
   def update
-    if current_user.update_attributes(user_params) && update_notification_settings
+    if current_user.update_attributes(user_params)
       flash[:notice] = "Notification settings saved"
     else
       flash[:alert] = "Failed to save new settings"
@@ -19,16 +19,4 @@ class Profiles::NotificationsController < Profiles::ApplicationController
   def user_params
     params.require(:user).permit(:notification_email)
   end
-
-  def global_notification_setting_params
-    params.require(:global_notification_setting).permit(:level)
-  end
-
-  private
-
-  def update_notification_settings
-    return true unless global_notification_setting_params
-
-    current_user.global_notification_setting.update_attributes(global_notification_setting_params)
-  end
 end
diff --git a/app/controllers/projects/notification_settings_controller.rb b/app/controllers/projects/notification_settings_controller.rb
deleted file mode 100644
index 05fe5accc65..00000000000
--- a/app/controllers/projects/notification_settings_controller.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-class Projects::NotificationSettingsController < Projects::ApplicationController
-  before_action :authenticate_user!
-
-  def update
-    @notification_setting = current_user.notification_settings_for(project)
-    saved = @notification_setting.update_attributes(notification_setting_params)
-
-    render json: {
-      html: view_to_html_string("projects/buttons/_notifications", locals: { project: @project, notification_setting: @notification_setting }),
-      saved: saved
-    }
-  end
-
-  private
-
-  def notification_setting_params
-    allowed_fields = NotificationSetting::EMAIL_EVENTS.dup
-    allowed_fields << :level
-    params.require(:notification_setting).permit(allowed_fields)
-  end
-end