diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb index 8471b20c0..44dc0f604 100644 --- a/app/controllers/notifications_controller.rb +++ b/app/controllers/notifications_controller.rb @@ -1,11 +1,11 @@ class NotificationsController < ApplicationController def index - set_page_and_extract_portion_from Current.user.notifications.read.ordered - - if @page.first? + unless current_page_param @unread = Current.user.notifications.unread.ordered end + set_page_and_extract_portion_from Current.user.notifications.read.ordered + respond_to do |format| format.turbo_stream if current_page_param # Allows read-all action to side step pagination format.html