From 8ef479bf3193fbba482c6a91923b4ec3ab37fee3 Mon Sep 17 00:00:00 2001 From: kikito Date: Tue, 6 Dec 2016 18:01:37 +0100 Subject: [PATCH] Changes routes to use budgets resource instead of namespace --- app/helpers/budget_helper.rb | 2 +- app/views/management/budgets/investments/index.html.erb | 2 +- app/views/management/budgets/investments/new.html.erb | 2 +- app/views/management/budgets/investments/print.html.erb | 2 +- config/routes.rb | 9 +++++++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/helpers/budget_helper.rb b/app/helpers/budget_helper.rb index 65e7ea683..881087acf 100644 --- a/app/helpers/budget_helper.rb +++ b/app/helpers/budget_helper.rb @@ -7,7 +7,7 @@ module BudgetHelper def namespaced_budget_investment_path(investment, options={}) case namespace when "management::budgets" - management_budgets_investment_path(investment, options) + management_budget_investment_path(investment, options) else budget_investment_path(investment, options.merge(budget_id: investment.budget_id)) end diff --git a/app/views/management/budgets/investments/index.html.erb b/app/views/management/budgets/investments/index.html.erb index 08ae3390d..9a597c6a7 100644 --- a/app/views/management/budgets/investments/index.html.erb +++ b/app/views/management/budgets/investments/index.html.erb @@ -1,6 +1,6 @@
- <%= render 'admin/shared/budget_investment_search', url: management_budgets_investments_path %> + <%= render 'admin/shared/budget_investment_search', url: management_budget_investments_path %>
diff --git a/app/views/management/budgets/investments/new.html.erb b/app/views/management/budgets/investments/new.html.erb index d761f81a3..1aa8431de 100644 --- a/app/views/management/budgets/investments/new.html.erb +++ b/app/views/management/budgets/investments/new.html.erb @@ -7,7 +7,7 @@

<%= t("management.budget_investments.create") %>

- <%= form_for(@investment, url: management_budgets_investments_path, method: :post) do |f| %> + <%= form_for(@investment, url: management_budget_investments_path(@budget), method: :post) do |f| %> <%= render 'shared/errors', resource: @investment %>
diff --git a/app/views/management/budgets/investments/print.html.erb b/app/views/management/budgets/investments/print.html.erb index a80f7d673..9c78f93cd 100644 --- a/app/views/management/budgets/investments/print.html.erb +++ b/app/views/management/budgets/investments/print.html.erb @@ -3,7 +3,7 @@
- <%= form_tag print_management_budgets_investments_path, method: :get, enforce_utf8: false do %> + <%= form_tag print_management_budget_investments_path, method: :get, enforce_utf8: false do %>
<%= select_tag :geozone, options_for_select(geozone_select_options.unshift([t("geozones.none"), "all"]), params[:geozone]), diff --git a/config/routes.rb b/config/routes.rb index 6a90ddd2a..77f7d167e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -286,8 +286,13 @@ Rails.application.routes.draw do get :print, on: :collection end - namespace :budgets do - resources :investments, only: [:index, :new, :create, :show] do + resources :budgets, only: :index do + collection do + get :create_investments + get :support_investments + get :print_investments + end + resources :investments, only: [:index, :new, :create, :show], controller: 'budgets/investments' do post :vote, on: :member get :print, on: :collection end