diff --git a/app/controllers/admin/budget_investments_controller.rb b/app/controllers/admin/budget_investments_controller.rb index 70a77c7ee..0d322920b 100644 --- a/app/controllers/admin/budget_investments_controller.rb +++ b/app/controllers/admin/budget_investments_controller.rb @@ -36,10 +36,8 @@ class Admin::BudgetInvestmentsController < Admin::BaseController end def edit - load_admins - load_valuators + load_staff load_valuator_groups - load_trackers load_tags end @@ -51,10 +49,8 @@ class Admin::BudgetInvestmentsController < Admin::BaseController Budget::Investment.filter_params(params).to_h), notice: t("flash.actions.update.budget_investment") else - load_admins - load_valuators + load_staff load_valuator_groups - load_trackers load_tags render :edit end @@ -103,18 +99,10 @@ class Admin::BudgetInvestmentsController < Admin::BaseController @investment = @budget.investments.find(params[:id]) end - def load_admins + def load_staff @admins = @budget.administrators.includes(:user) - end - - 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") + @trackers = @budget.trackers.includes(:user).order(description: :asc).order("users.email ASC") + @valuators = @budget.valuators.includes(:user).order(description: :asc).order("users.email ASC") end def load_valuator_groups diff --git a/app/controllers/admin/budgets_controller.rb b/app/controllers/admin/budgets_controller.rb index 1e9309f2f..0821b2ba1 100644 --- a/app/controllers/admin/budgets_controller.rb +++ b/app/controllers/admin/budgets_controller.rb @@ -17,15 +17,11 @@ class Admin::BudgetsController < Admin::BaseController end def new - load_admins - load_valuators - load_trackers + load_staff end def edit - load_admins - load_valuators - load_trackers + load_staff end def calculate_winners @@ -42,9 +38,7 @@ class Admin::BudgetsController < Admin::BaseController if @budget.update(budget_params) redirect_to admin_budgets_path, notice: t("admin.budgets.update.notice") else - load_admins - load_valuators - load_trackers + load_staff render :edit end end @@ -54,9 +48,7 @@ class Admin::BudgetsController < Admin::BaseController if @budget.save redirect_to admin_budget_path(@budget), notice: t("admin.budgets.create.notice") else - load_admins - load_valuators - load_trackers + load_staff render :new end end @@ -92,15 +84,9 @@ class Admin::BudgetsController < Admin::BaseController @budget = Budget.find_by_slug_or_id! params[:id] end - def load_admins + def load_staff @admins = Administrator.includes(:user) - end - - def load_trackers @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") end end