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

Extract methods to load budget staff

Browse Source
This commit is contained in:
Javi Martín
2019-10-30 22:13:26 +01:00
parent 458cffe50b
commit 483c75fb82
2 changed files with 10 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,10 +36,8 @@ class Admin::BudgetInvestmentsController < Admin::BaseController
end end
def edit def edit
load_admins load_staff
load_valuators
load_valuator_groups load_valuator_groups
load_trackers
load_tags load_tags
end end
@@ -51,10 +49,8 @@ class Admin::BudgetInvestmentsController < Admin::BaseController
Budget::Investment.filter_params(params).to_h), Budget::Investment.filter_params(params).to_h),
notice: t("flash.actions.update.budget_investment") notice: t("flash.actions.update.budget_investment")
else else
load_admins load_staff
load_valuators
load_valuator_groups load_valuator_groups
load_trackers
load_tags load_tags
render :edit render :edit
end end
@@ -103,18 +99,10 @@ class Admin::BudgetInvestmentsController < Admin::BaseController
@investment = @budget.investments.find(params[:id]) @investment = @budget.investments.find(params[:id])
end end
def load_admins def load_staff
@admins = @budget.administrators.includes(:user) @admins = @budget.administrators.includes(:user)
end @trackers = @budget.trackers.includes(:user).order(description: :asc).order("users.email ASC")
@valuators = @budget.valuators.includes(:user).order(description: :asc).order("users.email ASC")
def load_trackers
@trackers = @budget.trackers.includes(:user).order(description: :asc)
.order("users.email ASC")
end
def load_valuators
@valuators = @budget.valuators.includes(:user).order(description: :asc)
.order("users.email ASC")
end end
def load_valuator_groups def load_valuator_groups

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

@@ -17,15 +17,11 @@ class Admin::BudgetsController < Admin::BaseController
end end
def new def new
load_admins load_staff
load_valuators
load_trackers
end end
def edit def edit
load_admins load_staff
load_valuators
load_trackers
end end
def calculate_winners def calculate_winners
@@ -42,9 +38,7 @@ class Admin::BudgetsController < Admin::BaseController
if @budget.update(budget_params) if @budget.update(budget_params)
redirect_to admin_budgets_path, notice: t("admin.budgets.update.notice") redirect_to admin_budgets_path, notice: t("admin.budgets.update.notice")
else else
load_admins load_staff
load_valuators
load_trackers
render :edit render :edit
end end
end end
@@ -54,9 +48,7 @@ class Admin::BudgetsController < Admin::BaseController
if @budget.save if @budget.save
redirect_to admin_budget_path(@budget), notice: t("admin.budgets.create.notice") redirect_to admin_budget_path(@budget), notice: t("admin.budgets.create.notice")
else else
load_admins load_staff
load_valuators
load_trackers
render :new render :new
end end
end end
@@ -92,15 +84,9 @@ class Admin::BudgetsController < Admin::BaseController
@budget = Budget.find_by_slug_or_id! params[:id] @budget = Budget.find_by_slug_or_id! params[:id]
end end
def load_admins def load_staff
@admins = Administrator.includes(:user) @admins = Administrator.includes(:user)
end
def load_trackers
@trackers = Tracker.includes(:user).order(description: :asc).order("users.email ASC") @trackers = Tracker.includes(:user).order(description: :asc).order("users.email ASC")
end
def load_valuators
@valuators = Valuator.includes(:user).order(description: :asc).order("users.email ASC") @valuators = Valuator.includes(:user).order(description: :asc).order("users.email ASC")
end end
end end