Look at all note comments to find the close event

Fixes #2612

diff --git a/app/models/note.rb b/app/models/note.rb
index ec57b770bbc008c923b2394e71f02e4d24549521..ea88599a4a9db66fbf4c2df046f171f850a25195 100644 (file)
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -22,6 +22,7 @@ class Note < ApplicationRecord
   include GeoRecord
 
   has_many :comments, -> { left_joins(:author).where(:visible => true, :users => { :status => [nil, "active", "confirmed"] }).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id
+  has_many :all_comments, -> { left_joins(:author).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 884f95d57914013481a76688b41e11d5110be888..ffc198b0a52ebf6c05db80184cb3fba30ac84a82 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -15,7 +15,7 @@
     <%= note_event("opened", @note.created_at, @note.author) %>
     <% if @note.status == "closed" %>
       <br />
-      <%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %>
+      <%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %>
     <% end %>
   </div>