The user model has been modified so that it stores the user object itself in the...

[selectricity] / app / controllers / site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 3307d88a27e0e31c0c9e9fa99ce1efafb6fdb595..776832218c2b9a611e874a50564f3efa42805696 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -3,21 +3,23 @@ class SiteController < ApplicationController
   model :user, :election, :account
 
   def index
-    @quickvotes = QuickVote.find_all(["quickvote = 1"]).sort {|a,b| b.enddate <=> a.enddate}[0..1]
+    @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]
-
+   
+    if logged_in?
       # check to see that we actually have record of them
-      if User.find_all(["id = ?", session[:user].id]).length == 1
+      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].id)
+        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
+             # nothing and start again
         session[:user] = nil
+        
       end
     end
   end