X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7599f98957334d1924550205f7ba12a726de7eb0..c12fe5f6e82c9f0321825ba11eeec16e13f31b29:/app/models/note.rb diff --git a/app/models/note.rb b/app/models/note.rb index c32b1679b..801e1f3cb 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -39,7 +39,7 @@ class Note < ActiveRecord::Base resp += (comment_no == 1 ? "" : separator_char) resp += comment.body if comment.body resp += " [ " - resp += comment.author_name if comment.author_name + resp += comment.author.display_name if comment.author resp += " " + comment.created_at.to_s + " ]" comment_no += 1 end @@ -49,7 +49,7 @@ class Note < ActiveRecord::Base # Check if a note is visible def visible? - return status != "hidden" + status != "hidden" end # Return the author object, derived from the first comment @@ -62,16 +62,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