X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/5f51982916827b84d73bfa8f3a98a9ee1d48d3ce..22f84a3ea8bc39eb4cb91575d35dfca683336032:/app/controllers/site_controller.rb diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index d5eab86..dd049f7 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -1,6 +1,6 @@ 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] @@ -10,7 +10,7 @@ class SiteController < ApplicationController # 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