From: <mako@atdot.cc>
Date: Mon, 8 Jun 2009 13:06:58 +0000 (-0400)
Subject: fix weird bug with showing results from open elections
X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/b1b6fe468411fa18118846fef18c993167fdb570?ds=sidebyside;hp=f7e185abe92cf8a4590f32996c86d15b8309db86

fix weird bug with showing results from open elections
---

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
index d7f589d..afc0103 100644
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -31,6 +31,7 @@ class VoterController < ApplicationController
           :conditions => ["session_id = ? and election_id = ?",
           session.session_id, @election.id])[0]
       
+
         @voter = OpenVoter.new unless @voter
 
         @voter.election = @election
@@ -152,6 +153,7 @@ class VoterController < ApplicationController
   end
   
   def results
+    debugger
     if authenticate and
       (@voter.election.early_results? \
        or @voter.election.enddate < Time.now)
@@ -193,12 +195,22 @@ class VoterController < ApplicationController
     password = params[:id]
     if password == "open"
       election = Election.find(params[:format])
+
+      # double check to make sure the election is not authenticated
       unless election.authenticated?
         @voter = OpenVoter.find(:all,
           :conditions => ["session_id = ? and election_id = ?",
                           session.session_id, election.id])[0]
+
+        # if the election is over, proceed
+        if (not @voter) and (election.enddate < Time.now)
+          @voter = OpenVoter.new
+          @voter.election = election
+        end
+
         @password = "open." + election.id.to_s
       end
+
     else
       @voter = FullVoter.find(:all,
         :conditions => [ "password = ?", password ] )[0]