X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4b0191befd6ba3010b9d220a5deabf85254038ff..d2cf09f389b2b92aa2bc55f375573173a2bcf1a4:/app/models/map_bug.rb diff --git a/app/models/map_bug.rb b/app/models/map_bug.rb index 440b64b78..b07ef2941 100644 --- a/app/models/map_bug.rb +++ b/app/models/map_bug.rb @@ -1,7 +1,10 @@ class MapBug < ActiveRecord::Base include GeoRecord - has_many :map_bug_comment, :foreign_key => :bug_id, :order => :date_created, :conditions => "visible = true and comment is not null" + has_many :comments, :class_name => "MapBugComment", + :foreign_key => :bug_id, + :order => :date_created, + :conditions => "visible = true and comment is not null" validates_presence_of :id, :on => :update validates_uniqueness_of :id @@ -35,7 +38,7 @@ class MapBug < ActiveRecord::Base def flatten_comment(separator_char, upto_timestamp = :nil) resp = "" comment_no = 1 - self.map_bug_comment.each do |comment| + self.comments.each do |comment| next if upto_timestamp != :nil and comment.date_created > upto_timestamp resp += (comment_no == 1 ? "" : separator_char) resp += comment.comment if comment.comment