From 9099ee57790996d84fdbdbbf65754f0a0f5f4360 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Wed, 1 Feb 2017 23:51:14 +0000 Subject: [PATCH] Reduce complexity of plantings controller --- app/controllers/plantings_controller.rb | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/app/controllers/plantings_controller.rb b/app/controllers/plantings_controller.rb index 3bba8b5a6..8551072ff 100644 --- a/app/controllers/plantings_controller.rb +++ b/app/controllers/plantings_controller.rb @@ -124,16 +124,14 @@ class PlantingsController < ApplicationController end def plantings - @plantings = if @owner - @owner.plantings - elsif @crop - @crop.plantings - else - Planting - end - - @plantings = @plantings.current unless @show_all - @plantings = @plantings.includes(:owner, :crop, :garden).order(:created_at).paginate(page: params[:page]) - @plantings + p = if @owner + @owner.plantings + elsif @crop + @crop.plantings + else + Planting + end + p = p.current unless @show_all + p.includes(:owner, :crop, :garden).order(:created_at).paginate(page: params[:page]) end end