Allow correct routing of content_pages

expertiza · Aug 16, 2013 · 66426d4 · 66426d4
1 parent 5fdd922
commit 66426d4
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 172 deletions.
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
diff --git a/app/views/pages/contact_us.html.erb b/app/views/pages/contact_us.html.erb
diff --git a/app/views/pages/credits.html.erb b/app/views/pages/credits.html.erb
diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb
diff --git a/app/views/pages/site_admin.html.erb b/app/views/pages/site_admin.html.erb
diff --git a/config/routes.rb b/config/routes.rb
@@ -49,7 +49,7 @@
   resources :content_pages do
     collection do
       get :list
-      match ':id', action: :show
+      get ':page_name', action: :view
     end
   end
 
@@ -297,7 +297,7 @@
   match '/menu/*name', controller: :menu_items, action: :link
   match ':page_name', controller: :content_pages, action: :view, method: :get
 
-  root to: 'pages#home'
+  root to: 'content_pages#view', page_name: 'home'
 
   map.connect 'question/select_questionnaire_type', :controller => "questionnaire", :action => 'select_questionnaire_type'
   map.connect ':controller/service.wsdl', :action => 'wsdl'