github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 04:31:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: unread pms go in front of notification report

Browse Source 
also refactor fat controller
This commit is contained in:
Sam
2014-02-13 17:12:17 +11:00
parent 4ff6780758
commit e8aa85d783
3 changed files with 72 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/notifications_controller.rb
View File

@ -3,17 +3,8 @@ class NotificationsController < ApplicationController
before_filter :ensure_logged_in
def index
notifications = current_user.notifications.recent.includes(:topic)
notifications = Notification.recent_report(current_user)
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)
end
notifications = notifications.to_a
current_user.saw_notification_id(notifications.first.id) if notifications.present?
current_user.reload
current_user.publish_notifications_state