diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb index b11d54cd9..aa6e146df 100644 --- a/app/controllers/notifications_controller.rb +++ b/app/controllers/notifications_controller.rb @@ -9,7 +9,7 @@ class NotificationsController < ApplicationController num = 45 notified_at_offset = Notification.find(params[:page])&.notified_at else - num = 10 + num = 8 end @notifications = if (params[:org_id].present? || params[:filter] == "org") && allowed_user? organization_notifications diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb index 74b2983f7..160cb595c 100644 --- a/app/views/notifications/index.html.erb +++ b/app/views/notifications/index.html.erb @@ -36,7 +36,7 @@ <% @organizations.each do |org| %>
-

<%= org.name %> <%= "(#{org.notifications.where(read: false).size})" if org.notifications.where(read: false).size.positive? %>

+

<%= org.name %>

" href="/notifications/org/<%= org.id %>">ALL @@ -56,7 +56,7 @@ <% @organizations.each do |org| %>

- <%= org.name %> <%= "(#{org.notifications.where(read: false).size})" if org.notifications.where(read: false).size.positive? %> + <%= org.name %> " href="/notifications/org/<%= org.id %>">ALL " href="/notifications/comments/<%= org.id %>">COMMENTS