From ca11792286ef49dc102df5b008aefed83884ff95 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 20 Oct 2019 14:13:30 +1300 Subject: [PATCH] Only show companions of active plantings --- app/controllers/gardens_controller.rb | 7 ++++--- app/views/gardens/show.html.haml | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb index d6f8680e6..8a39b6dc1 100644 --- a/app/controllers/gardens_controller.rb +++ b/app/controllers/gardens_controller.rb @@ -17,10 +17,11 @@ class GardensController < ApplicationController end def show - @current_plantings = @garden.plantings.current - .includes(:crop, :owner) - .order(planted_at: :desc) + @current_plantings = @garden.plantings.current.includes(:crop, :owner).order(planted_at: :desc) @finished_plantings = @garden.plantings.finished.includes(:crop) + @suggested_companions = Crop.approved.where( + id: CropCompanion.where(crop_a_id: @current_plantings.select(:crop_id)).select(:crop_b_id) + ).order(:name) respond_with(@garden) end diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml index e883d4314..4bd44b740 100644 --- a/app/views/gardens/show.html.haml +++ b/app/views/gardens/show.html.haml @@ -59,9 +59,8 @@ %section.companions %h2 Suggestioned companions - - @garden.plantings.each do |planting| - - planting.crop.companions.approved.each do |companion| - = render 'crops/tiny', crop: companion + - @suggested_companions.each do |companion| + = render 'crops/tiny', crop: companion %section= render 'previously'