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

Merge branch 'master' into content_blocks_for_headings

Browse Source
This commit is contained in:
Julian Nicolas Herrero
2018-12-11 16:40:25 +01:00
committed by GitHub
parent 9f455b9165 9aab3ddd7b
commit 6aa54d6c62
181 changed files with 1635 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/routes/admin.rb
View File

@@ -29,7 +29,7 @@ namespace :admin do
end
end
resources :proposals, only: :index do
resources :hidden_proposals, only: :index do
member do
put :restore
put :confirm_hide
@@ -62,14 +62,14 @@ namespace :admin do
end
resources :budget_investments, only: [:index, :show, :edit, :update] do
resources :budget_investment_milestones
resources :milestones, controller: 'budget_investment_milestones'
member { patch :toggle_selection }
end
resources :budget_phases, only: [:edit, :update]
end
resources :budget_investment_statuses, only: [:index, :new, :create, :update, :edit, :destroy]
resources :milestone_statuses, only: [:index, :new, :create, :update, :edit, :destroy]
resources :signature_sheets, only: [:index, :new, :create, :show]