X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/fd484b33a3920e0031007c5c2f1dec61913cbab5..6df3d73c4a0c52d79f3e8abe5180fbd73953a6a5:/app/controllers/site_controller.rb?ds=sidebyside

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index f2eb153..a33a1fa 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,13 +1,27 @@
 class SiteController < ApplicationController
-  layout 'vb'
-  model :user, :election
+  layout 'main'
+  model :user, :election, :account
 
   def index
-    if session[:user]
-      session[:user] = User.find(session[:user].id)
-      @current_elections = session[:user].elections.sort do |a,b|
-        b.enddate <=> a.enddate
+    @quickvotes = QuickVote.find(:all).sort {|a,b| b.enddate <=> a.enddate}[0..1]
+    # if the person claims they are logged in
+   
+    if logged_in?
+      # check to see that we actually have record of them
+      if User.exists?(session[:user])
+        username = User.find(session[:user]).login
+        # if we have record of them, grab the list of their elections
+        session[:user] = User.find(session[:user])
+        @current_elections = session[:user].elections.sort do |a,b|
+          b.enddate <=> a.enddate
+        end
+      else
+        # if we have no record of them, set the user back to
+	      # nothing and start again
+        session[:user] = nil
+        
       end
     end
   end
+
 end