From 46d17e8aa72ca8097b283be453be7bc52a257f2d Mon Sep 17 00:00:00 2001 From: taitus Date: Tue, 28 Jul 2020 13:19:48 +0200 Subject: [PATCH] Remove redundant calls to load resources --- app/controllers/budgets/executions_controller.rb | 2 +- app/controllers/budgets/groups_controller.rb | 4 ++-- app/controllers/budgets/investments_controller.rb | 2 +- app/controllers/budgets/results_controller.rb | 2 +- app/controllers/budgets/stats_controller.rb | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/budgets/executions_controller.rb b/app/controllers/budgets/executions_controller.rb index 09a908928..30f53bd58 100644 --- a/app/controllers/budgets/executions_controller.rb +++ b/app/controllers/budgets/executions_controller.rb @@ -2,7 +2,7 @@ module Budgets class ExecutionsController < ApplicationController before_action :load_budget - load_and_authorize_resource :budget + authorize_resource :budget def show authorize! :read_executions, @budget diff --git a/app/controllers/budgets/groups_controller.rb b/app/controllers/budgets/groups_controller.rb index d289cca49..b0124135f 100644 --- a/app/controllers/budgets/groups_controller.rb +++ b/app/controllers/budgets/groups_controller.rb @@ -2,8 +2,8 @@ module Budgets class GroupsController < ApplicationController before_action :load_budget before_action :load_group - load_and_authorize_resource :budget - load_and_authorize_resource :group, class: "Budget::Group" + authorize_resource :budget + authorize_resource :group, class: "Budget::Group" before_action :set_default_budget_filter, only: :show has_filters %w[not_unfeasible feasible unfeasible unselected selected winners], only: [:show] diff --git a/app/controllers/budgets/investments_controller.rb b/app/controllers/budgets/investments_controller.rb index 9728c8ef3..de3c0c2f2 100644 --- a/app/controllers/budgets/investments_controller.rb +++ b/app/controllers/budgets/investments_controller.rb @@ -12,7 +12,7 @@ module Budgets before_action :authenticate_user!, except: [:index, :show, :json_data] before_action :load_budget, except: :json_data - load_and_authorize_resource :budget, except: :json_data + authorize_resource :budget, except: :json_data load_and_authorize_resource :investment, through: :budget, class: "Budget::Investment", except: :json_data diff --git a/app/controllers/budgets/results_controller.rb b/app/controllers/budgets/results_controller.rb index 5910e292d..ac37ac549 100644 --- a/app/controllers/budgets/results_controller.rb +++ b/app/controllers/budgets/results_controller.rb @@ -3,7 +3,7 @@ module Budgets before_action :load_budget before_action :load_heading - load_and_authorize_resource :budget + authorize_resource :budget def show authorize! :read_results, @budget diff --git a/app/controllers/budgets/stats_controller.rb b/app/controllers/budgets/stats_controller.rb index 0ce61c108..0bbd86e5f 100644 --- a/app/controllers/budgets/stats_controller.rb +++ b/app/controllers/budgets/stats_controller.rb @@ -1,7 +1,7 @@ module Budgets class StatsController < ApplicationController before_action :load_budget - load_and_authorize_resource :budget + authorize_resource :budget def show authorize! :read_stats, @budget