]> git.openstreetmap.org Git - rails.git/commitdiff
Improves behavior if note lacks opening comment
authorNenad Vujicic <nenadus@gmail.com>
Wed, 19 Feb 2025 14:59:09 +0000 (15:59 +0100)
committerNenad Vujicic <nenadus@gmail.com>
Thu, 20 Feb 2025 22:54:49 +0000 (23:54 +0100)
Adds checking if note lacks opening comment and if positive, returns nil for both note's author and description.

app/models/note.rb

index b7215d6f7706084318ecefcd845d303771f14fc9..0a1f4abd7fed5594c0560180d5c77163a4066a02 100644 (file)
@@ -95,7 +95,7 @@ class Note < ApplicationRecord
   # Return the note's description, derived from the first comment
   def description
     if user_ip.nil? && user_id.nil?
   # Return the note's description, derived from the first comment
   def description
     if user_ip.nil? && user_id.nil?
-      all_comments.first.body
+      all_comments.first.body if all_comments.first&.event == "opened"
     else
       RichText.new("text", super)
     end
     else
       RichText.new("text", super)
     end
@@ -104,7 +104,7 @@ class Note < ApplicationRecord
   # Return the note's author object, derived from the first comment
   def author
     if user_ip.nil? && user_id.nil?
   # Return the note's author object, derived from the first comment
   def author
     if user_ip.nil? && user_id.nil?
-      all_comments.first.author
+      all_comments.first.author if all_comments.first&.event == "opened"
     else
       super
     end
     else
       super
     end