Merge pull request #216 from NikitaRubocki/develop

Develop - Branch 215 DB consolidation
osu-cascades · Apr 28, 2022 · 7de8872 · 7de8872
2 parents 8b2c391 + 0926047
commit 7de8872
Show file tree

Hide file tree

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

diff --git a/app/controllers/mycorrhizal_fungi_samples_controller.rb b/app/controllers/mycorrhizal_fungi_samples_controller.rb
@@ -5,7 +5,7 @@ class MycorrhizalFungiSamplesController < ApplicationController
  before_action :set_mycorrhizal_fungi_sample, only: [:show, :edit, :update, :destroy]
 
  def index
- @mycorrhizal_fungi_samples = MycorrhizalFungiSample.order(collected_on: :desc).page(params[:page])
+ @mycorrhizal_fungi_samples = MycorrhizalFungiSample.order(collected_on: :desc).page(params[:page]).includes(:plot)
  end
 
  def show; end

diff --git a/app/controllers/nonvascular_plant_samples_controller.rb b/app/controllers/nonvascular_plant_samples_controller.rb
@@ -5,7 +5,7 @@ class NonvascularPlantSamplesController < ApplicationController
  before_action :set_nonvascular_plant_sample, only: [:show, :edit, :update, :destroy]
 
  def index
- @nonvascular_plant_samples = NonvascularPlantSample.order(collected_on: :desc).page(params[:page])
+ @nonvascular_plant_samples = NonvascularPlantSample.order(collected_on: :desc).page(params[:page]).includes(:plot)
  end
 
  def show;