From 911593b480d6800f976e95d3d78cd3b9fc0a2a51 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Fri, 24 Mar 2017 21:10:45 +1300 Subject: [PATCH] Reduces query numbes on gardens#show --- app/controllers/gardens_controller.rb | 1 + app/views/gardens/show.html.haml | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb index 174d45d5f..8a705ed8d 100644 --- a/app/controllers/gardens_controller.rb +++ b/app/controllers/gardens_controller.rb @@ -17,6 +17,7 @@ class GardensController < ApplicationController # GET /gardens/1 # GET /gardens/1.json def show + @plantings = @garden.plantings.includes(:crop, :garden, :owner, :harvests) respond_with(@garden) end diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml index 8b6c3a5d3..a4e009a41 100644 --- a/app/views/gardens/show.html.haml +++ b/app/views/gardens/show.html.haml @@ -65,18 +65,18 @@ .row-fluid %h3 What's planted here? - - if @garden.plantings.current.empty? + - if @plantings.current.empty? %p Nothing is currently planted here. - else - - @garden.plantings.current.each.with_index do |planting_current, _| + - @plantings.current.each.with_index do |planting_current, _| = render partial: "plantings/thumbnail", locals: { planting: planting_current } .row-fluid %h3 Previously planted in this garden - - if @garden.plantings.finished.empty? + - if @plantings.finished.empty? %p Nothing has been planted here. - else - - @garden.plantings.finished.each.with_index do |planting_finished| + - @plantings.finished.each.with_index do |planting_finished| = render partial: "plantings/thumbnail", locals: { planting: planting_finished } .col-md-3 %h4 About this garden