Merge 15722:15806 from head and adjust new views to rails 2 style names.

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

diff --git a/app/models/message.rb b/app/models/message.rb
index 97e411192b0df5cedbd89d7255f236ac7fb2cf35..464c5502837b56c5ffdf409ff32288f6b5779cac 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -1,8 +1,12 @@
+require 'validators'
+
 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
+  validates_presence_of :title, :body, :sent_on, :sender, :recipient
+  validates_length_of :title, :within => 1..255
   validates_inclusion_of :message_read, :in => [ true, false ]
   validates_associated :sender, :recipient
+  validates_as_utf8 :title
 end