X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/34fe63727a8929d7e9c529feee1f0c1e827acdfa..34bf38d5323c3d9f43ecc9ec15d60ef0e535a2ff:/app/controllers/site_controller.rb?ds=sidebyside

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 47ae2cb..dd049f7 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,15 +1,16 @@
 class SiteController < ApplicationController
   layout 'hc'
-  model :user, :election
+  model :user, :election, :account
 
   def index
+    @quickvotes = QuickVote.find_all(["quickvote = 1"]).sort {|a,b| b.enddate <=> a.enddate}[0..1]
     # if the person claims they are logged in
     if session[:user]
 
       # check to see that we actually have record of them
       if User.find_all(["id = ?", session[:user].id]).length == 1
         # if we have record of them, grab the list of their elections
-        session[:user] = User.find(session[:user].id)
+        session[:user] = User.find(session[:user])
         @current_elections = session[:user].elections.sort do |a,b|
           b.enddate <=> a.enddate
         end