X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/57a05a40fcc81048c2df1f78e024d4671acd46b1..3700b534e404a25ef5db1bb8283bae3cddb818fb:/app/models/diary_entry.rb?ds=inline diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb index 20acd962e..9146eb800 100644 --- a/app/models/diary_entry.rb +++ b/app/models/diary_entry.rb @@ -8,7 +8,7 @@ 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" @@ -20,6 +20,5 @@ 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 end