Added Global to the drop downs and updated the label of the button to show the current level instead of `Notifications`

1 files changed, 18 insertions, 1 deletions

diff --git a/app/models/notification.rb b/app/models/notification.rb
index 828378655ce..171b8df45c2 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -26,7 +26,7 @@ class Notification
     end
 
     def project_notification_levels
-      [N_DISABLED, N_PARTICIPATING, N_WATCH, N_GLOBAL, N_MENTION]
+      [N_DISABLED, N_MENTION, N_PARTICIPATING, N_WATCH, N_GLOBAL]
     end
   end
 
@@ -57,4 +57,21 @@ class Notification
   def level
     target.notification_level
   end
+  
+  def to_s
+    case level
+    when N_DISABLED
+      'Disabled'
+    when N_PARTICIPATING
+      'Participating'
+    when N_WATCH
+      'Watching'
+    when N_MENTION
+      'On mention'
+    when N_GLOBAL
+      'Global'
+    else
+      # do nothing      
+    end
+  end
 end