Minor code cleanup
This commit is contained in:
parent
23f9a64566
commit
47e926bec0
|
@ -86,9 +86,10 @@ class ProjectsController < ApplicationController
|
||||||
if @project.empty_repo?
|
if @project.empty_repo?
|
||||||
render 'projects/empty'
|
render 'projects/empty'
|
||||||
else
|
else
|
||||||
unless current_user.nil?
|
if current_user
|
||||||
@membership = @project.project_members.find_by_user_id(current_user.id)
|
@membership = @project.project_member_by_id(current_user.id)
|
||||||
end
|
end
|
||||||
|
|
||||||
render :show
|
render :show
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
|
|
@ -16,31 +16,31 @@ module NotificationsHelper
|
||||||
def notification_list_item(notification_level, user_membership)
|
def notification_list_item(notification_level, user_membership)
|
||||||
case notification_level
|
case notification_level
|
||||||
when Notification::N_DISABLED
|
when Notification::N_DISABLED
|
||||||
content_tag(:li, class: active_level_for(user_membership, 'disabled?')) do
|
content_tag(:li, class: active_level_for(user_membership, Notification::N_DISABLED)) do
|
||||||
link_to '#', class: 'update-notification', data: { notification_level: Notification::N_DISABLED } do
|
link_to '#', class: 'update-notification', data: { notification_level: Notification::N_DISABLED } do
|
||||||
icon('microphone-slash fw', text: 'Disabled')
|
icon('microphone-slash fw', text: 'Disabled')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
when Notification::N_PARTICIPATING
|
when Notification::N_PARTICIPATING
|
||||||
content_tag(:li, class: active_level_for(user_membership, 'participating?')) do
|
content_tag(:li, class: active_level_for(user_membership, Notification::N_PARTICIPATING)) do
|
||||||
link_to '#', class: 'update-notification', data: { notification_level: Notification::N_PARTICIPATING } do
|
link_to '#', class: 'update-notification', data: { notification_level: Notification::N_PARTICIPATING } do
|
||||||
icon('volume-up fw', text: 'Participate')
|
icon('volume-up fw', text: 'Participate')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
when Notification::N_WATCH
|
when Notification::N_WATCH
|
||||||
content_tag(:li, class: active_level_for(user_membership, 'watch?')) do
|
content_tag(:li, class: active_level_for(user_membership, Notification::N_WATCH)) do
|
||||||
link_to '#', class: 'update-notification', data: { notification_level: Notification::N_WATCH } do
|
link_to '#', class: 'update-notification', data: { notification_level: Notification::N_WATCH } do
|
||||||
icon('eye fw', text: 'Watch')
|
icon('eye fw', text: 'Watch')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
when Notification::N_MENTION
|
when Notification::N_MENTION
|
||||||
content_tag(:li, class: active_level_for(user_membership, 'mention?')) do
|
content_tag(:li, class: active_level_for(user_membership, Notification::N_MENTION)) do
|
||||||
link_to '#', class: 'update-notification', data: { notification_level: Notification::N_MENTION } do
|
link_to '#', class: 'update-notification', data: { notification_level: Notification::N_MENTION } do
|
||||||
icon('at fw', text: 'On mention')
|
icon('at fw', text: 'On mention')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
when Notification::N_GLOBAL
|
when Notification::N_GLOBAL
|
||||||
content_tag(:li, class: active_level_for(user_membership, 'global?')) do
|
content_tag(:li, class: active_level_for(user_membership, Notification::N_GLOBAL)) do
|
||||||
link_to '#', class: 'update-notification', data: { notification_level: Notification::N_GLOBAL } do
|
link_to '#', class: 'update-notification', data: { notification_level: Notification::N_GLOBAL } do
|
||||||
icon('globe fw', text: 'Global')
|
icon('globe fw', text: 'Global')
|
||||||
end
|
end
|
||||||
|
@ -55,9 +55,6 @@ module NotificationsHelper
|
||||||
end
|
end
|
||||||
|
|
||||||
def active_level_for(user_membership, level)
|
def active_level_for(user_membership, level)
|
||||||
value = Notification.new(user_membership)
|
'active' if user_membership.notification_level == level
|
||||||
if value.send(level)
|
|
||||||
'active'
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
- if current_user and !@membership.nil?
|
- return unless @membership
|
||||||
|
|
||||||
= form_tag profile_notifications_path, method: :put, remote: true, class: 'inline-form', id: 'notification-form' do
|
= 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_type, 'project'
|
||||||
= hidden_field_tag :notification_id, @membership.id
|
= hidden_field_tag :notification_id, @membership.id
|
||||||
|
|
Loading…
Reference in New Issue