github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 02:09:54 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

correctly handle empty case

Browse Source
This commit is contained in:
Sam 2014-02-13 17:27:35 +11:00
parent e8aa85d783
commit bf957513ec
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/models/notification.rb
View File

@ -91,7 +91,7 @@ class Notification < ActiveRecord::Base
def self.recent_report(user, count = nil) def self.recent_report(user, count = nil)
notifications = user.notifications.recent(count).includes(:topic) notifications = user.notifications.recent(count).includes(:topic).to_a
if notifications.present? if notifications.present?
notifications += user.notifications notifications += user.notifications
@ -99,17 +99,19 @@ class Notification < ActiveRecord::Base
.where(read: false, notification_type: Notification.types[:private_message]) .where(read: false, notification_type: Notification.types[:private_message])
.where('id < ?', notifications.last.id) .where('id < ?', notifications.last.id)
.limit(count) .limit(count)
end
notifications.sort do |x,y| notifications.sort do |x,y|
if x.unread_pm? && !y.unread_pm? if x.unread_pm? && !y.unread_pm?
-1 -1
elsif y.unread_pm? && !x.unread_pm? elsif y.unread_pm? && !x.unread_pm?
1 1
else else
y.created_at <=> x.created_at y.created_at <=> x.created_at
end end
end.take(count) end.take(count)
else
[]
end
end end