Allow custimizable graph sizes, to fit with newly modular results page. Also,

[selectricity] / app / controllers / quickvote_controller.rb

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index bb60b4552b029efff74be54bba9282c7599a671f..031c0755adb2a7f38b2d8c1b9c7b632778d0c99d 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -4,7 +4,7 @@ class QuickvoteController < ApplicationController
   require_dependency "quick_vote"
   require_dependency "vote"
   require_dependency "election"
   require_dependency "quick_vote"
   require_dependency "vote"
   require_dependency "election"

-
+  

   #############################################################
   # the following methods pertain to creating quickvotes
   #############################################################
   #############################################################
   # the following methods pertain to creating quickvotes
   #############################################################


@@ -29,6 +29,7 @@ class QuickvoteController < ApplicationController
       # here has not been hitting this page and we can clear any
       # candlist in the flash
       flash.delete(:candlist) if flash.has_key?(:candlist)
       # here has not been hitting this page and we can clear any
       # candlist in the flash
       flash.delete(:candlist) if flash.has_key?(:candlist)

+      @quickvote = QuickVote.new

     end
   end
 
     end
   end
 


@@ -161,8 +162,11 @@ class QuickvoteController < ApplicationController
       redirect_to :controller => 'site'
       return
     end
       redirect_to :controller => 'site'
       return
     end

-    @election.results
+    @results = @election.results

     @candidates = {}
     @election.candidates.each {|c| @candidates[c.id] = c}
   end
     @candidates = {}
     @election.candidates.each {|c| @candidates[c.id] = c}
   end

+  
+  

 end
 end

+