mergec minor changes from live

[selectricity-live] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index e2f458d3e2afeed8eea48e44df290ed4b8c0b728..efd6a28e9fba914f696a9f78303ea6f3fc97ebc1 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -17,7 +17,11 @@ 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',