From 355419b6cba3485cb07264d0ab9e9f72184cc767 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Wed, 1 Feb 2017 23:53:55 +0000 Subject: [PATCH 1/2] Reduce complexity of seeds controller --- app/controllers/seeds_controller.rb | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/app/controllers/seeds_controller.rb b/app/controllers/seeds_controller.rb index 85f181e45..d2d47f356 100644 --- a/app/controllers/seeds_controller.rb +++ b/app/controllers/seeds_controller.rb @@ -7,13 +7,7 @@ class SeedsController < ApplicationController def index @owner = Member.find_by(slug: params[:owner]) @crop = Crop.find_by(slug: params[:crop]) - @seeds = if @owner - @owner.seeds.includes(:owner, :crop).paginate(page: params[:page]) - elsif @crop - @crop.seeds.includes(:owner, :crop).paginate(page: params[:page]) - else - Seed.includes(:owner, :crop).paginate(page: params[:page]) - end + @seeds = seeds respond_to do |format| format.html # index.html.erb @@ -109,4 +103,14 @@ class SeedsController < ApplicationController :days_until_maturity_min, :days_until_maturity_max, :organic, :gmo, :heirloom, :tradable_to, :slug) end + + def seeds + if @owner + @owner.seeds + elsif @crop + @crop.seeds + else + Seed + end.includes(:owner, :crop).paginate(page: params[:page]) + end end From 93e9428bb663be21ef02ceb6493771cd804af127 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Fri, 3 Feb 2017 11:11:47 +1030 Subject: [PATCH 2/2] Repair missing items from Gemfile.lock --- Gemfile.lock | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 4e6d521ca..7431156a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -240,6 +240,12 @@ GEM parser (>= 2.2.3.0) term-ansicolor (>= 1.3.2) terminal-table (>= 1.5.1) + jasmine (2.5.1) + jasmine-core (>= 2.5.1, < 3.0.0) + phantomjs + rack (>= 1.2.1) + rake + jasmine-core (2.5.2) jquery-rails (4.2.2) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -324,6 +330,7 @@ GEM parser (2.3.3.1) ast (~> 2.2) pg (0.19.0) + phantomjs (2.1.1.0) plupload-rails (1.2.1) rails (>= 3.1) poltergeist (1.11.0)