Merge pull request #35 from tomhughes/routing

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

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index de2a42ae3a36c118edef60913b56d98aecb85316..c0fbac546a9f47756c6239ee06fd9ee3cb1bb883 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -2,18 +2,10 @@ class DiaryEntry < ActiveRecord::Base
   belongs_to :user, :counter_cache => true
   belongs_to :language, :foreign_key => 'language_code'
 
   belongs_to :user, :counter_cache => true
   belongs_to :language, :foreign_key => 'language_code'
 

-  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"
+  has_many :comments, -> { order(:id).preload(:user) }, :class_name => "DiaryComment"
+  has_many :visible_comments, -> { joins(:user).where(:visible => true, :users => { :status => ["active", "confirmed"] }).order(:id) }, :class_name => "DiaryComment"

 
 

-  scope :visible, where(:visible => true)
+  scope :visible, -> { where(:visible => true) }

 
   validates_presence_of :title, :body
   validates_length_of :title, :within => 1..255
 
   validates_presence_of :title, :body
   validates_length_of :title, :within => 1..255


@@ -24,9 +16,6 @@ class DiaryEntry < ActiveRecord::Base
                             :greater_than_or_equal_to => -180, :less_than_or_equal_to => 180
   validates_associated :language
 
                             :greater_than_or_equal_to => -180, :less_than_or_equal_to => 180
   validates_associated :language
 

-  attr_accessible :title, :body, :language_code, :latitude, :longitude
-
-  after_initialize :set_defaults

   after_save :spam_check
 
   def body
   after_save :spam_check
 
   def body


@@ -35,10 +24,6 @@ class DiaryEntry < ActiveRecord::Base
 
 private
 
 
 private
 

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

   def spam_check
     user.spam_check
   end
   def spam_check
     user.spam_check
   end