merge from live

[selectricity-live] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index e2f458d3e2afeed8eea48e44df290ed4b8c0b728..8c52ca077ad23e90fea7493117831242c2b55d9f 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -17,13 +17,17 @@ ActionController::Routing::Routes.draw do |map|
 
   map.connect 'voter/:action',
               :controller => 'voter',
-              :requirements => { :action => /(review|confirm|authenticate|index|login|reminder)/ }
+              :requirements => { :action => /(review|confirm|authenticate|index|login|reminder|results)/ }
+
+  map.voteopen 'voter/open.:election_id',
+                   :controller => 'voter',
+                   :action => 'index'
 
   map.votepassword 'voter/:urlpassword',
                    :controller => 'voter',
                    :action => 'index'
 
-  map.connect 'quickvote/:action/:id',
+  map.connect 'quickvote/:action/(open.)?:id',
                :controller => 'quickvote',
                :requirements => { :action => /(create|add_candidate|sort_candidates|my_quickvotes)/ }