consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3580 from consul/use_find_instead_of_find_by_id

Browse Source 
Use find instead of find by
This commit is contained in:
Javier Martín
2019-06-05 19:04:47 +02:00
committed by GitHub
parent cbad8ad416 b122302c58
commit 81b67349f2
30 changed files with 549 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/admin/budget_groups_controller.rb
View File

@@ -46,11 +46,11 @@ class Admin::BudgetGroupsController < Admin::BaseController
private
def load_budget
@budget = Budget.includes(:groups).find(params[:budget_id])
@budget = Budget.find_by_slug_or_id! params[:budget_id]
end
def load_group
@group = @budget.groups.find(params[:id])
@group = @budget.groups.find_by_slug_or_id! params[:id]
end
def groups_index

6
app/controllers/admin/budget_headings_controller.rb
View File

@@ -47,15 +47,15 @@ class Admin::BudgetHeadingsController < Admin::BaseController
private
def load_budget
@budget = Budget.includes(:groups).find(params[:budget_id])
@budget = Budget.find_by_slug_or_id! params[:budget_id]
end
def load_group
@group = @budget.groups.find(params[:group_id])
@group = @budget.groups.find_by_slug_or_id! params[:group_id]
end
def load_heading
@heading = @group.headings.find(params[:id])
@heading = @group.headings.find_by_slug_or_id! params[:id]
end
def headings_index

2
app/controllers/admin/budget_investments_controller.rb
View File

@@ -87,7 +87,7 @@ class Admin::BudgetInvestmentsController < Admin::BaseController
end
def load_budget
@budget = Budget.includes(:groups).find(params[:budget_id])
@budget = Budget.find_by_slug_or_id! params[:budget_id]
end
def load_investment

5
app/controllers/admin/budgets_controller.rb
View File

@@ -6,6 +6,7 @@ class Admin::BudgetsController < Admin::BaseController
has_filters %w{open finished}, only: :index
before_action :load_budget, except: [:index, :new, :create]
load_and_authorize_resource
def index
@@ -66,4 +67,8 @@ class Admin::BudgetsController < Admin::BaseController
params.require(:budget).permit(*valid_attributes, *report_attributes, translation_params(Budget))
end
def load_budget
@budget = Budget.find_by_slug_or_id! params[:id]
end
end