fixes conflicts with budget

This commit is contained in:
rgarcia
2016-07-27 11:41:46 +02:00
260 changed files with 8185 additions and 1693 deletions

View File

@@ -84,6 +84,12 @@ Rails.application.routes.draw do
end
end
scope module: :budget do
resources :budgets do
resources :investments, only: [:index]
end
end
resources :stats, only: [:index]
resources :legislations, only: [:show]
@@ -92,7 +98,9 @@ Rails.application.routes.draw do
get :search, on: :collection
end
resources :users, only: [:show]
resources :users, only: [:show] do
resources :direct_messages, only: [:new, :create, :show]
end
resource :account, controller: "account", only: [:show, :update, :delete] do
get :erase, on: :collection
@@ -102,6 +110,8 @@ Rails.application.routes.draw do
put :mark_all_as_read, on: :collection
end
resources :proposal_notifications, only: [:new, :create, :show]
resource :verification, controller: "verification", only: [:show]
scope module: :verification do
@@ -152,6 +162,10 @@ Rails.application.routes.draw do
get :summary, on: :collection
end
resources :banners, only: [:index, :new, :create, :edit, :update, :destroy] do
collection { get :search}
end
resources :comments, only: :index do
member do
put :restore
@@ -183,7 +197,10 @@ Rails.application.routes.draw do
end
resource :activity, controller: :activity, only: :show
resource :stats, only: :show
resource :stats, only: :show do
get :proposal_notifications, on: :collection
get :direct_messages, on: :collection
end
namespace :api do
resource :stats, only: :show
@@ -233,6 +250,8 @@ Rails.application.routes.draw do
resources :email_verifications, only: [:new, :create]
resources :user_invites, only: [:new, :create]
resources :users, only: [:new, :create] do
collection do
delete :logout
@@ -263,6 +282,6 @@ Rails.application.routes.draw do
mount Tolk::Engine => '/translate', :as => 'tolk'
# static pages
get '/blog' => redirect("http://diario.madrid.es/participa/")
get '/blog' => redirect("http://blog.consul/")
resources :pages, path: '/', only: [:show]
end