Avoid submit_tag to avoid 'Save changes' default

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

diff --git a/app/models/message.rb b/app/models/message.rb
index b51c59f4359d950bd614be043ad2bf79e2174ddb..aff628e035901e685c18515902087db8e48a088d 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -1,15 +1,37 @@
-require 'validators'
+# == Schema Information
+#
+# Table name: messages
+#
+#  id                :integer          not null, primary key
+#  from_user_id      :integer          not null
+#  title             :string           not null
+#  body              :text             not null
+#  sent_on           :datetime         not null
+#  message_read      :boolean          default(FALSE), not null
+#  to_user_id        :integer          not null
+#  to_user_visible   :boolean          default(TRUE), not null
+#  from_user_visible :boolean          default(TRUE), not null
+#  body_format       :enum             default("markdown"), not null
+#
+# Indexes
+#
+#  messages_from_user_id_idx  (from_user_id)
+#  messages_to_user_id_idx    (to_user_id)
+#
+# Foreign Keys
+#
+#  messages_from_user_id_fkey  (from_user_id => users.id)
+#  messages_to_user_id_fkey    (to_user_id => users.id)
+#
+
+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
 
 
 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_length_of :title, :within => 1..255
-  validates_inclusion_of :message_read, :in => [ true, false ]
-  validates_as_utf8 :title
-
-  after_initialize :set_defaults
+  validates :title, :presence => true, :utf8 => true, :length => 1..255
+  validates :body, :sent_on, :sender, :recipient, :presence => true

 
   def self.from_mail(mail, from, to)
     if mail.multipart?
 
   def self.from_mail(mail, from, to)
     if mail.multipart?


@@ -18,13 +40,13 @@ class Message < ActiveRecord::Base
       elsif mail.html_part
         body = HTMLEntities.new.decode(Sanitize.clean(mail.html_part.decoded))
       end
       elsif mail.html_part
         body = HTMLEntities.new.decode(Sanitize.clean(mail.html_part.decoded))
       end

-    elsif mail.text? and mail.sub_type == "html"
+    elsif mail.text? && mail.sub_type == "html"

       body = HTMLEntities.new.decode(Sanitize.clean(mail.decoded))
     else
       body = mail.decoded
     end
 
       body = HTMLEntities.new.decode(Sanitize.clean(mail.decoded))
     else
       body = mail.decoded
     end
 

-    message = Message.new(
+    Message.new(

       :sender => from,
       :recipient => to,
       :sent_on => mail.date.new_offset(0),
       :sender => from,
       :recipient => to,
       :sent_on => mail.date.new_offset(0),


@@ -35,7 +57,7 @@ class Message < ActiveRecord::Base
   end
 
   def body
   end
 
   def body

-    RichText.new(read_attribute(:body_format), read_attribute(:body))
+    RichText.new(self[:body_format], self[:body])

   end
 
   def digest
   end
 
   def digest


@@ -47,10 +69,4 @@ class Message < ActiveRecord::Base
     md5 << body
     md5.hexdigest
   end
     md5 << body
     md5.hexdigest
   end

-
-private
-
-  def set_defaults
-    self.body_format = "markdown" unless self.attribute_present?(:body_format)
-  end

 end
 end