Modified the methods in graphs controller so they would work for Selectricity, but...

[selectricity-live] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index af9820fdab90256d33fe6a0b7b17ed8ac4023b52..7a7b1013c146c7564fec40abc96932d36bff9b53 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,4 @@
-ActionController::Routing::Routes.draw do |map|
+ActionController::Routing::Routes.draw do |map|  
   # The priority is based upon order of creation: first created -> highest priority.
   
   # Sample of regular route:
@@ -12,23 +12,23 @@ ActionController::Routing::Routes.draw do |map|
   # You can have the root of your site routed by hooking up '' 
   # -- just remember to delete public/index.html.
   map.connect '', :controller => "site"
+ 
+  map.connect 'quickvote/:action/:id',
+               :controller => 'quickvote',
+               :requirements => { :action => /(create|add_candidate|sort_candidates)/ }
 
-  map.connect 'quickvote/create',
-             :controller => 'site',
-             :action => 'create_quickvote'
-             
-  map.quickconfirm 'quickvote/:votename/confirm',
-              :controller => 'voter',
-             :action => 'confirm'
+  map.quickaction 'quickvote/:votename/:action',
+                  :controller => 'quickvote',
+                       :requirements => { :action => /(change|confirm|results)/ }
 
   map.quickvote 'quickvote/:votename',
-                :controller => 'voter',
-               :action => 'quickvote'
+                :controller => 'quickvote', :action => 'index'
 
   # Allow downloading Web Service WSDL as a file with an extension
   # instead of a file named 'wsdl'
   map.connect ':controller/service.wsdl', :action => 'wsdl'
 
   # Install the default route as the lowest priority.
+  map.connect ':controller/:action/:id.:format'
   map.connect ':controller/:action/:id'
 end