Merge branch 'dev' into bw/plantingshelper-simplify

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)

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(owner: @owner, crop: @crop)
 
     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(owner: nil, crop: nil)
+    if owner
+      owner.seeds
+    elsif crop
+      crop.seeds
+    else
+      Seed
+    end.includes(:owner, :crop).paginate(page: params[:page])
+  end
 end