diff options
| author | Patricio Cano <suprnova32@gmail.com> | 2015-09-14 20:33:24 -0500 |
|---|---|---|
| committer | Patricio Cano <suprnova32@gmail.com> | 2015-09-14 20:33:24 -0500 |
| commit | 01cc20378be1b77bd2a40a6af257e2cf116ce26a (patch) | |
| tree | 043a3d8fc24f1cea2f530ffb1122e5ad00d12a96 /app/views/projects/buttons | |
| parent | 8a6fb46dff970d599860b06a6c9105c503cbb89c (diff) | |
| download | gitlab-ce-01cc20378be1b77bd2a40a6af257e2cf116ce26a.tar.gz | |
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.
Diffstat (limited to 'app/views/projects/buttons')
| -rw-r--r-- | app/views/projects/buttons/_notifications.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/buttons/_notifications.html.haml b/app/views/projects/buttons/_notifications.html.haml index 76e462a8986..6d9d48994e1 100644 --- a/app/views/projects/buttons/_notifications.html.haml +++ b/app/views/projects/buttons/_notifications.html.haml @@ -1,7 +1,7 @@ -- if current_user and !@membership_id.nil? +- if current_user and !@membership.nil? = form_tag profile_notifications_path, method: :put, remote: true, class: 'inline-form', id: 'notification-form' do = hidden_field_tag :notification_type, 'project' - = hidden_field_tag :notification_id, @membership_id + = hidden_field_tag :notification_id, @membership.id = hidden_field_tag :notification_level %span.dropdown %a.dropdown-toggle.btn.btn-new{href: '#', "data-toggle" => "dropdown"} @@ -9,4 +9,4 @@ Notifications %ul.dropdown-menu.dropdown-menu-right.project-home-dropdown - Notification.notification_levels.each do |level| - = notification_list_item(level)
\ No newline at end of file + = notification_list_item(level, @membership)
\ No newline at end of file |