]> projects.mako.cc - selectricity/commitdiff
merged in from code from the other master
authorBenjamin Mako Hill <mako@atdot.cc>
Mon, 6 Sep 2010 18:32:41 +0000 (14:32 -0400)
committerBenjamin Mako Hill <mako@atdot.cc>
Mon, 6 Sep 2010 18:32:41 +0000 (14:32 -0400)
1  2 
app/controllers/voter_controller.rb

index 5d729a6752800f7f799666b3c45d3bc38ceca375,afc01039b8e535b7733844f44bf0b5429ed64b2e..408bdab880ec0f411a1d19f8eea0261f3b5d1d02
@@@ -123,31 -153,32 +123,32 @@@ class VoterController < ApplicationCont
    end
    
    def results
-     if @voter.election.early_results? \
-        or @voter.election.enddate < Time.now
 -    debugger
+     if authenticate and
+       (@voter.election.early_results? \
+        or @voter.election.enddate < Time.now)
        
        @election = @voter.election
 -      # compute and display results
 -
 -      @results = @election.results
 -      @candidates = {}
 -      @election.candidates.each {|c| @candidates[c.id] = c}
 -      @names = @election.names_by_id
 -        
 -      @sidebar_content = render_to_string(:partial => 'results_sidebar')
 -      #look for custom theme, and assign to instance variabels for widget use
 +      @sidebar_content = \
 +        render_to_string(:partial => 'full_results_sidebar')
 +
 +      # look for custom theme, and assign to instance variabels for
 +      # widget use
        if @election.embed_custom_string
          @top_bar = SkinPicture.find(:first,
 -        :conditions => ["filename = ?", @election.embed_custom_string + "top_bar.png"])
 +          :conditions => ["filename = ?",
 +            @election.embed_custom_string + "top_bar.png"])
          @default_image = SkinPicture.find(:first,
 -        :conditions => ["filename = ?", @election.embed_custom_string + "default_image.png"])
 +          :conditions => ["filename = ?",
 +            @election.embed_custom_string + "default_image.png"])
          @bg1 = SkinPicture.find(:first,
 -        :conditions => ["filename = ?", @election.embed_custom_string + "bg1.png"])
 +          :conditions => ["filename = ?",
 +            @election.embed_custom_string + "bg1.png"])
          @bg2 = SkinPicture.find(:first,
 -        :conditions => ["filename = ?", @election.embed_custom_string + "bg2.png"])
 +          :conditions => ["filename = ?",
 +            @election.embed_custom_string + "bg2.png"])
          @bottom_bar = SkinPicture.find(:first,
 -        :conditions => ["filename = ?", @election.embed_custom_string + "bottom_bar.png"])
 +          :conditions => ["filename = ?",
 +            @election.embed_custom_string + "bottom_bar.png"])
        end
        if @election.embeddable? and params[:embed] == "true"
          render :template => 'embed/results', :layout => 'embed'
            :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
 +        # when (a) there is no voter or (b) when there is a voter but
 +        # it's kiosk mode on the right page, rewrite with a blank voter
-         if not(@voter) \
++        if ((not @voter) and  (election.enddate < Time.now)) \
 +          or (params[:action] == 'kiosk_ready' and election.kiosk)
 +          @voter = OpenVoter.new unless @voter
          end
  
 +        # now that we have a voter (one way or another), set things
 +        # right
 +        @voter.election = election
 +        @voter.session_id = session.session_id
          @password = "open." + election.id.to_s
        end
  

Benjamin Mako Hill || Want to submit a patch?