upgraded to latest version of rubyvote in svn

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index d5eab862c5326434d9bc6979be4cc85b2caa7eba..e86624e5f9f985772fc9a9a0f22eb8b8b419fe6d 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,23 +1,25 @@
 class SiteController < ApplicationController
 class SiteController < ApplicationController

-  layout 'hc'
-  model :user, :election
+  layout 'main'
+  model :user, :election, :account

 
   def index
 
   def index

-    @quickvotes = QuickVote.find_all(["quickvote = 1"]).sort {|a,b| b.enddate <=> a.enddate}[0..1]
+    @quickvotes = QuickVote.find(:all).sort {|a,b| b.enddate <=> a.enddate}[0..1]

     # if the person claims they are logged in
     # if the person claims they are logged in

-    if session[:user]
-
+   
+    if logged_in?

       # check to see that we actually have record of them
       # 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
         # 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
         @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
         session[:user] = nil

+        

       end
     end
   end
       end
     end
   end