diff --git a/app/controllers/follows_controller.rb b/app/controllers/follows_controller.rb index dafddfc3a..15546742f 100644 --- a/app/controllers/follows_controller.rb +++ b/app/controllers/follows_controller.rb @@ -1,6 +1,6 @@ class FollowsController < ApplicationController before_action :authenticate_member! - before_action :set_member, only: [:index, :followers] + before_action :set_member, only: %i(index followers) load_and_authorize_resource skip_load_resource only: :create diff --git a/app/controllers/gardens_controller.rb b/app/controllers/gardens_controller.rb index 16095d468..e69fda623 100644 --- a/app/controllers/gardens_controller.rb +++ b/app/controllers/gardens_controller.rb @@ -9,7 +9,7 @@ class GardensController < ApplicationController def index @owner = Member.find_by(slug: params[:member_slug]) @show_all = params[:all] == '1' - + @gardens = @gardens.active unless @show_all @gardens = @gardens.where(owner: @owner) if @owner.present? @gardens = @gardens.joins(:owner).order(:name).paginate(page: params[:page]) diff --git a/app/controllers/harvests_controller.rb b/app/controllers/harvests_controller.rb index 2f252edf2..0192fe403 100644 --- a/app/controllers/harvests_controller.rb +++ b/app/controllers/harvests_controller.rb @@ -15,7 +15,7 @@ class HarvestsController < ApplicationController @harvests = @harvests.where(crop: @crop) if @crop.present? @harvests = @harvests.where(planting: @planting) if @planting.present? @harvests = @harvests.order(harvested_at: :desc).joins(:owner, :crop).paginate(page: params[:page]) - + @filename = csv_filename respond_with(@harvests) diff --git a/app/controllers/plantings_controller.rb b/app/controllers/plantings_controller.rb index ed4edf0e0..f75d95f37 100644 --- a/app/controllers/plantings_controller.rb +++ b/app/controllers/plantings_controller.rb @@ -110,9 +110,9 @@ class PlantingsController < ApplicationController def specifics if @owner - "#{@owner.login_name}-" - elsif @crop - "#{@crop.name}-" + "#{@owner.login_name}-" + elsif @crop + "#{@crop.name}-" end end end diff --git a/app/controllers/seeds_controller.rb b/app/controllers/seeds_controller.rb index ce4e8ac40..f1d34ecf1 100644 --- a/app/controllers/seeds_controller.rb +++ b/app/controllers/seeds_controller.rb @@ -68,7 +68,7 @@ class SeedsController < ApplicationController :finished, :finished_at ) end - + def csv_filename if @owner "Growstuff-#{@owner}-Seeds-#{Time.zone.now.to_s(:number)}.csv"