Merge pull request #213 from NikitaRubocki/develop

Beginning query consolidation
osu-cascades · Apr 25, 2022 · 8b2c391 · 8b2c391
2 parents cd52b60 + 46d74c3
commit 8b2c391
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/soil_samples_controller.rb b/app/controllers/soil_samples_controller.rb
@@ -5,7 +5,7 @@ class SoilSamplesController < ApplicationController
  before_action :set_soil_sample, only: [:show, :edit, :update, :destroy]
 
  def index
- @soil_samples = SoilSample.order(collected_on: :desc).page(params[:page])
+ @soil_samples = SoilSample.order(collected_on: :desc).page(params[:page]).includes(:plot, :nutrients)
  end
 
  def show; end

diff --git a/app/controllers/species_variation_observations_controller.rb b/app/controllers/species_variation_observations_controller.rb
@@ -5,7 +5,7 @@ class SpeciesVariationObservationsController < ApplicationController
  before_action :set_species_variation_observation, only: [:show, :edit, :update, :destroy]
 
  def index
- @species_variation_observations = SpeciesVariationObservation.order(observed_on: :desc).page(params[:page])
+ @species_variation_observations = SpeciesVariationObservation.order(observed_on: :desc).page(params[:page]).includes(:plot, :plant)
  end
 
  def show

diff --git a/app/controllers/tree_samples_controller.rb b/app/controllers/tree_samples_controller.rb
@@ -5,7 +5,7 @@ class TreeSamplesController < ApplicationController
  before_action :set_tree_sample, only: [:show, :edit, :update, :destroy]
 
  def index
- @tree_samples = TreeSample.order(collected_on: :desc).page(params[:page])
+ @tree_samples = TreeSample.order(collected_on: :desc).page(params[:page]).includes(:plot, :plant)
  respond_to do |format|
  format.html
  format.csv { send_data @tree_samples.to_csv, filename: "treesamples-#{Date.today}.csv" }