Merge from head

[selectricity-live] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index ee64eabaa4a50025e4a467d04ade5b11a782d1b9..96beafd4dde7af51ba160cde5e02fff5794c7dd0 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -17,11 +17,11 @@ ActionController::Routing::Routes.draw do |map|
                :controller => 'quickvote',
                :requirements => { :action => /(create|add_candidate|sort_candidates)/ }
 
-  map.quickaction 'quickvote/:votename/:action',
+  map.quickaction 'quickvote/:ident/:action',
                   :controller => 'quickvote',
                        :requirements => { :action => /(change|confirm|results)/ }
 
-  map.quickvote 'quickvote/:votename',
+  map.quickvote 'quickvote/:ident',
                 :controller => 'quickvote', :action => 'index'
 
   # Allow downloading Web Service WSDL as a file with an extension