Notification dropdown now shows currently active level, and also shows what the actual value of `global` is, if the project has the notification level set to global.

1 files changed, 14 insertions, 5 deletions

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 829993fd77f..48dc198e4e2 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -13,28 +13,28 @@ module NotificationsHelper
     end
   end
 
-  def notification_list_item(notification_level)
+  def notification_list_item(notification_level, user_membership)
     case notification_level
     when Notification::N_DISABLED
-      content_tag(:li) do
+      content_tag(:li, class: active_level_for(user_membership, 'disabled?')) do
         link_to '#', class: 'update-notification', data: { notification_level: Notification::N_DISABLED } do
           icon('microphone-slash fw', text: 'Disabled')
         end
       end
     when Notification::N_PARTICIPATING
-      content_tag(:li) do
+      content_tag(:li, class: active_level_for(user_membership, 'participating?')) do
         link_to '#', class: 'update-notification', data: { notification_level: Notification::N_PARTICIPATING } do
           icon('volume-up fw', text: 'Participating')
         end
       end
     when Notification::N_WATCH
-      content_tag(:li) do
+      content_tag(:li, class: active_level_for(user_membership, 'watch?')) do
         link_to '#', class: 'update-notification', data: { notification_level: Notification::N_WATCH } do
           icon('globe fw', text: 'Watch')
         end
       end
     when Notification::N_MENTION
-      content_tag(:li) do
+      content_tag(:li, class: active_level_for(user_membership, 'mention?')) do
         link_to '#', class: 'update-notification', data: { notification_level: Notification::N_MENTION }  do
           icon('at fw', text: 'Mention')
         end
@@ -43,4 +43,13 @@ module NotificationsHelper
       # do nothing
     end
   end
+
+  def active_level_for(user_membership, level)
+    value = Notification.new(user_membership)
+    if value.global?
+      return 'active' if current_user.notification.send(level)
+    elsif value.send(level)
+      return 'active'
+    end
+  end
 end