X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6f88f4d03fbe43b7005921192589966dd589affe..e2b364d002054455f9f6575264d6f465bf3ed29d:/app/models/note.rb?ds=inline diff --git a/app/models/note.rb b/app/models/note.rb index c32b1679b..490ff43cb 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -30,26 +30,14 @@ class Note < ActiveRecord::Base self.save end - # Return a flattened version of the comments for a note - def flatten_comment(separator_char, upto_timestamp = :nil) - resp = "" - comment_no = 1 - self.comments.each do |comment| - next if upto_timestamp != :nil and comment.created_at > upto_timestamp - resp += (comment_no == 1 ? "" : separator_char) - resp += comment.body if comment.body - resp += " [ " - resp += comment.author_name if comment.author_name - resp += " " + comment.created_at.to_s + " ]" - comment_no += 1 - end - - return resp - end - # Check if a note is visible def visible? - return status != "hidden" + status != "hidden" + end + + # Check if a note is closed + def closed? + not closed_at.nil? end # Return the author object, derived from the first comment @@ -62,16 +50,6 @@ class Note < ActiveRecord::Base self.comments.first.author_ip end - # Return the author id, derived from the first comment - def author_id - self.comments.first.author_id - end - - # Return the author name, derived from the first comment - def author_name - self.comments.first.author_name - end - private # Fill in default values for new notes