Fix more DeprecationWarnings

[selectricity-live] / app / controllers / site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 8d2f8b2a63c46a719efac7da711c7ad646f7e458..80fdfc406c3247b16651ae5c6b0bada8c2d35625 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,12 +1,29 @@
 class SiteController < ApplicationController
-  layout 'vb'
-  model :user, :election
+  layout 'main'
+  require_dependency "user"
+  require_dependency "election"
+  require_dependency "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 user back to
+             # nothing and start again
+        session[:user] = nil
+        
+      end
     end
-
-    
   end
+
 end