Merge branch 'dev' into bw/inactive-gardens

2026-05-12 01:36:26 -04:00 · 2017-02-02 22:40:21 +00:00
parent 2424e7de87 b5a5aca67b
commit 909164ea70
1 changed files with 9 additions and 11 deletions
--- 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