Merge branch 'master' into content_blocks_for_headings
This commit is contained in:
@@ -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]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user