diff --git a/app/assets/javascripts/budget_edit_associations.js b/app/assets/javascripts/budget_edit_associations.js index 213ce14ab..e37c6e27a 100644 --- a/app/assets/javascripts/budget_edit_associations.js +++ b/app/assets/javascripts/budget_edit_associations.js @@ -1,28 +1,18 @@ (function() { "use strict"; App.BudgetEditAssociations = { - set_text: function(response) { - $(".js-budget-show-administrators-list").text(response.administrators); - $(".js-budget-show-valuators-list").text(response.valuators); - $(".js-budget-show-trackers-list").text(response.trackers); - }, initialize: function() { $(".js-budget-list-checkbox-user").on({ click: function() { - var admin_count, budget, params, tracker_count, url, valuator_count; + var admin_count, tracker_count, valuator_count; + admin_count = $(".js-budget-list-checkbox-administrators:checkbox:checked").length; valuator_count = $(".js-budget-list-checkbox-valuators:checkbox:checked").length; tracker_count = $(".js-budget-list-checkbox-trackers:checkbox:checked").length; - budget = $(".js-budget-id").attr("id"); - url = "/admin/budgets/" + budget + "/assigned_users_translation.json"; - params = { - administrators: admin_count, - valuators: valuator_count, - trackers: tracker_count - }; - $.get(url, params, function(response) { - App.BudgetEditAssociations.set_text(response, "json"); - }); + + App.I18n.set_pluralize($(".js-budget-show-administrators-list"), admin_count); + App.I18n.set_pluralize($(".js-budget-show-valuators-list"), valuator_count); + App.I18n.set_pluralize($(".js-budget-show-trackers-list"), tracker_count); } }); $(".js-budget-show-users-list").on({ diff --git a/app/controllers/admin/budgets_controller.rb b/app/controllers/admin/budgets_controller.rb index 39475de36..40bb1727f 100644 --- a/app/controllers/admin/budgets_controller.rb +++ b/app/controllers/admin/budgets_controller.rb @@ -72,13 +72,6 @@ class Admin::BudgetsController < Admin::BaseController end end - def assigned_users_translation - render json: { administrators: t("admin.budgets.edit.administrators", count: params[:administrators].to_i), - valuators: t("admin.budgets.edit.valuators", count: params[:valuators].to_i), - trackers: t("admin.budgets.edit.trackers", count: params[:trackers].to_i) - } - end - private def budget_params diff --git a/app/models/abilities/administrator.rb b/app/models/abilities/administrator.rb index 05b66c78f..07238f548 100644 --- a/app/models/abilities/administrator.rb +++ b/app/models/abilities/administrator.rb @@ -59,7 +59,7 @@ module Abilities can :manage, Dashboard::Action - can [:index, :read, :new, :create, :update, :destroy, :calculate_winners, :assigned_users_translation], Budget + can [:index, :read, :new, :create, :update, :destroy, :calculate_winners], Budget can [:read, :create, :update, :destroy], Budget::Group can [:read, :create, :update, :destroy], Budget::Heading can [:hide, :admin_update, :toggle_selection], Budget::Investment diff --git a/app/views/admin/budgets/_form.html.erb b/app/views/admin/budgets/_form.html.erb index 484927d7a..ea8624a2a 100644 --- a/app/views/admin/budgets/_form.html.erb +++ b/app/views/admin/budgets/_form.html.erb @@ -2,8 +2,6 @@ <%= translatable_form_for [:admin, @budget] do |f| %> -
- <%= render "shared/errors", resource: @budget %>