Pass the correct locale to Nominatim.describe_location

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

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index c6f4eaa12f1e2a38b991122082abe76ed08b7353..99a56b2ce1b8c4486110c4a9ba5662be171c3667 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -1,13 +1,19 @@
 class DiaryEntry < ActiveRecord::Base
-  belongs_to :user
+  belongs_to :user, :counter_cache => true
   belongs_to :language, :foreign_key => 'language_code'
-  
-  has_many :diary_comments, :include => :user,
-                            :conditions => {
-                              :users => { :visible => true },
-                              :visible => true
-                            },
-                            :order => "diary_comments.id"
+
+  has_many :comments, :class_name => "DiaryComment",
+                      :include => :user,
+                      :order => "diary_comments.id"
+  has_many :visible_comments, :class_name => "DiaryComment",
+                              :include => :user,
+                              :conditions => {
+                                :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
@@ -16,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