Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

[rails.git] / app / models / message.rb

diff --git a/app/models/message.rb b/app/models/message.rb
index 590e3e35780308425fe7c61c46e934d7a16ac70d..ec712be252a706b9c1e68541dd3e4a816b90f7a1 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -1,2 +1,8 @@
 class Message < ActiveRecord::Base
+  belongs_to :sender, :class_name => "User", :foreign_key => :from_user_id
+  belongs_to :recipient, :class_name => "User", :foreign_key => :to_user_id
+
+  validates_presence_of :title, :body, :sent_on, :sender, :recipient
+  validates_inclusion_of :message_read, :in => [ true, false ]
+  validates_associated :sender, :recipient
 end