X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/57a05a40fcc81048c2df1f78e024d4671acd46b1..0330e109437fdcb8fbfdd112492699607b507d4c:/app/models/diary_entry.rb

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index 20acd962e..64a412d28 100644
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -8,11 +8,13 @@ class DiaryEntry < ActiveRecord::Base
   has_many :visible_comments, :class_name => "DiaryComment",
                               :include => :user,
                               :conditions => {
-                                :users => { :visible => true },
+                                :users => { :status => ["active", "confirmed" ] },
                                 :visible => true
                               },
                               :order => "diary_comments.id"
 
+  scope :visible, where(:visible => true)
+
   validates_presence_of :title, :body
   validates_length_of :title, :within => 1..255
   #validates_length_of :language, :within => 2..5, :allow_nil => false
@@ -20,6 +22,19 @@ class DiaryEntry < ActiveRecord::Base
                             :greater_than_or_equal_to => -90, :less_than_or_equal_to => 90
   validates_numericality_of :longitude, :allow_nil => true,
                             :greater_than_or_equal_to => -180, :less_than_or_equal_to => 180
-  validates_associated :user
   validates_associated :language
+
+  attr_accessible :title, :body, :language_code, :latitude, :longitude
+
+  after_initialize :set_defaults
+
+  def body
+    RichText.new(read_attribute(:body_format), read_attribute(:body))
+  end
+
+private
+
+  def set_defaults
+    self.body_format = "markdown" unless self.attribute_present?(:body_format)
+  end
 end