Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

we need some, albeit hacky way of clearing these old pms, make at least some way of finding them

This commit is contained in:
Sam 2013-05-16 17:30:30 +10:00
parent 7e1c5ae5b7
commit 88417725b5
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/notifications_controller.rb
View File

@ -3,7 +3,17 @@ class NotificationsController < ApplicationController
before_filter :ensure_logged_in before_filter :ensure_logged_in
def index def index
notifications = current_user.notifications.recent.includes(:topic).all notifications = current_user.notifications.recent.includes(:topic).all.to_a
if notifications.present?
notifications += current_user.notifications
.order('created_at desc')
.where(read: false, notification_type: Notification.types[:private_message])
.where('id < ?', notifications.last.id)
.limit(5)
.to_a
end
current_user.saw_notification_id(notifications.first.id) if notifications.present? current_user.saw_notification_id(notifications.first.id) if notifications.present?
current_user.reload current_user.reload
current_user.publish_notifications_state current_user.publish_notifications_state