X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bbf30e76e4bfcd70e62fc84ecd32c5e494506e9e..917d7324a6f1d3f6256b1a541a912ccee84097d1:/app/models/diary_entry.rb diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb index 0524b75cf..1d836353f 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 @@ -21,4 +23,6 @@ class DiaryEntry < ActiveRecord::Base validates_numericality_of :longitude, :allow_nil => true, :greater_than_or_equal_to => -180, :less_than_or_equal_to => 180 validates_associated :language + + attr_accessible :title, :body, :language_code, :latitude, :longitude end