From e695d5646a53cfcd0748cb0e38883b63c4dcb138 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Wed, 7 Dec 2016 20:12:12 +1300 Subject: [PATCH] FIX Gardens query was running twice in contoller --- app/controllers/gardens_controller.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb index a83089844..d836b0e85 100644 --- a/app/controllers/gardens_controller.rb +++ b/app/controllers/gardens_controller.rb @@ -5,11 +5,12 @@ class GardensController < ApplicationController # GET /gardens # GET /gardens.json def index - @gardens = Garden.paginate(page: params[:page]) @owner = Member.find_by(slug: params[:owner]) - if @owner - @gardens = @owner.gardens.paginate(page: params[:page]) - end + @gardens = if @owner + @owner.gardens.paginate(page: params[:page]) + else + Garden.paginate(page: params[:page]) + end respond_to do |format| format.html # index.html.erb