Merge branch 'master' into dashboard

config/routes/admin.rb

@@ -29,7 +29,12 @@ namespace :admin do
     end
   end
 
-  resources :proposals, only: :index do
+  resources :proposals, only: [:index, :show] do
+    resources :milestones, controller: "proposal_milestones"
+    resources :progress_bars, except: :show, controller: "proposal_progress_bars"
+  end
+
+  resources :hidden_proposals, only: :index do
     member do
       put :restore
       put :confirm_hide
@@ -57,19 +62,20 @@ namespace :admin do
       put :calculate_winners
     end
 
-    resources :budget_groups do
-      resources :budget_headings
+    resources :groups, except: [:show], controller: "budget_groups" do
+      resources :headings, except: [:show], controller: "budget_headings"
     end
 
     resources :budget_investments, only: [:index, :show, :edit, :update] do
-      resources :budget_investment_milestones
+      resources :milestones, controller: "budget_investment_milestones"
+      resources :progress_bars, except: :show, controller: "budget_investment_progress_bars"
       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]
 
@@ -133,7 +139,7 @@ namespace :admin do
       resources :results, only: :index
     end
 
-    resources :officers do
+    resources :officers, only: [:index, :new, :create, :destroy] do
       get :search, on: :collection
     end
 
@@ -146,13 +152,15 @@ namespace :admin do
     end
 
     resources :questions, shallow: true do
-      resources :answers, except: [:index, :destroy], controller: 'questions/answers' do
-        resources :images, controller: 'questions/answers/images'
-        resources :videos, controller: 'questions/answers/videos'
-        get :documents, to: 'questions/answers#documents'
+      resources :answers, except: [:index, :destroy], controller: "questions/answers" do
+        resources :images, controller: "questions/answers/images"
+        resources :videos, controller: "questions/answers/videos"
+        get :documents, to: "questions/answers#documents"
       end
-      post '/answers/order_answers', to: 'questions/answers#order_answers'
+      post "/answers/order_answers", to: "questions/answers#order_answers"
     end
+
+    resource :active_polls, only: [:create, :edit, :update]
   end
 
   resources :verifications, controller: :verifications, only: :index do
@@ -198,6 +206,9 @@ namespace :admin do
         member { patch :toggle_selection }
       end
       resources :draft_versions
+      resources :milestones
+      resources :progress_bars, except: :show
+      resource :homepage, only: [:edit, :update]
     end
   end
 
@@ -208,9 +219,14 @@ namespace :admin do
   resources :geozones, only: [:index, :new, :create, :edit, :update, :destroy]
 
   namespace :site_customization do
-    resources :pages, except: [:show]
+    resources :pages, except: [:show] do
+      resources :cards, only: [:index]
+    end
     resources :images, only: [:index, :update, :destroy]
     resources :content_blocks, except: [:show]
+    delete "/heading_content_blocks/:id", to: "content_blocks#delete_heading_content_block", as: "delete_heading_content_block"
+    get "/edit_heading_content_blocks/:id", to: "content_blocks#edit_heading_content_block", as: "edit_heading_content_block"
+    put "/update_heading_content_blocks/:id", to: "content_blocks#update_heading_content_block", as: "update_heading_content_block"
     resources :information_texts, only: [:index] do
       post :update, on: :collection
     end