From 63cee1edc9fe51e4e89f14d58a2f15ede6f42a36 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Wed, 29 Mar 2017 08:21:02 +1300 Subject: [PATCH] Back to reading @garden.plantings --- app/controllers/gardens_controller.rb | 1 - app/views/gardens/show.html.haml | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb index 8a705ed8d..174d45d5f 100644 --- a/app/controllers/gardens_controller.rb +++ b/app/controllers/gardens_controller.rb @@ -17,7 +17,6 @@ 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 a4e009a41..8b6c3a5d3 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 @plantings.current.empty? + - if @garden.plantings.current.empty? %p Nothing is currently planted here. - else - - @plantings.current.each.with_index do |planting_current, _| + - @garden.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 @plantings.finished.empty? + - if @garden.plantings.finished.empty? %p Nothing has been planted here. - else - - @plantings.finished.each.with_index do |planting_finished| + - @garden.plantings.finished.each.with_index do |planting_finished| = render partial: "plantings/thumbnail", locals: { planting: planting_finished } .col-md-3 %h4 About this garden