X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/4efa3e9bc47cc649205a399fde51ed7e61bef7f8..b9f3bbdefb7bb1abd63193e2162aae1e78e1a1cb:/app/controllers/site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 8d2f8b2..e86624e 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,12 +1,27 @@
 class SiteController < ApplicationController
-  layout 'vb'
-  model :user, :election
+  layout 'main'
+  model :user, :election, :account
 
   def index
-    @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 session id back to
+	      # nothing and start again
+        session[:user] = nil
+        
+      end
     end
-
-    
   end
+
 end