From 808fe0411a7c4deb51b9b37257b01e12169e3f2e Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Sun, 23 Apr 2017 14:54:33 -0500
Subject: [PATCH] /notes, /note_versions: fix N+1 queries on note creators,
 updaters.

---
 app/controllers/note_versions_controller.rb | 1 +
 app/controllers/notes_controller.rb         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/controllers/note_versions_controller.rb b/app/controllers/note_versions_controller.rb
index 53fde4995..bcf9380c7 100644
--- a/app/controllers/note_versions_controller.rb
+++ b/app/controllers/note_versions_controller.rb
@@ -4,6 +4,7 @@ class NoteVersionsController < ApplicationController
   def index
     @note_versions = NoteVersion.search(params[:search]).order("note_versions.id desc").paginate(params[:page], :limit => params[:limit])
     respond_with(@note_versions) do |format|
+      format.html { @note_versions = @note_versions.includes(:updater) }
       format.xml do
         render :xml => @note_versions.to_xml(:root => "note-versions")
       end
diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 1bbba3129..bed70f667 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -8,6 +8,7 @@ class NotesController < ApplicationController
   def index
     @notes = Note.search(params[:search]).order("id desc").paginate(params[:page], :limit => params[:limit], :search_count => params[:search])
     respond_with(@notes) do |format|
+      format.html { @notes = @notes.includes(:creator) }
       format.xml do
         render :xml => @notes.to_xml(:root => "notes")
       end