From: Tom Hughes <tom@compton.nu>
Date: Mon, 3 Aug 2009 14:33:53 +0000 (+0000)
Subject: Exclude deleted messages from the new_messages relationship.
X-Git-Tag: live~6796
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/254ce1eca0052a004a24065d247e55b8fe5b7675?hp=1288a89bdcb1299d8dded7b24c8afce0c4dac7b8

Exclude deleted messages from the new_messages relationship.
---

diff --git a/app/models/user.rb b/app/models/user.rb
index 5625527bd..9a1106972 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -4,7 +4,7 @@ class User < ActiveRecord::Base
   has_many :traces, :conditions => { :visible => true }
   has_many :diary_entries, :order => 'created_at DESC'
   has_many :messages, :foreign_key => :to_user_id, :conditions => { :to_user_visible => true }, :order => 'sent_on DESC'
-  has_many :new_messages, :class_name => "Message", :foreign_key => :to_user_id, :conditions => { :message_read => false }, :order => 'sent_on DESC'
+  has_many :new_messages, :class_name => "Message", :foreign_key => :to_user_id, :conditions => { :to_user_visible => true, :message_read => false }, :order => 'sent_on DESC'
   has_many :sent_messages, :class_name => "Message", :foreign_key => :from_user_id, :conditions => { :from_user_visible => true }, :order => 'sent_on DESC'
   has_many :friends, :include => :befriendee, :conditions => ["users.visible = ?", true]
   has_many :tokens, :class_name => "UserToken"