Reorganized the README file and added a short list of dependencies.

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 41eb136a3758256cd066c32cb885ba2259aed2eb..dd049f7311d2bf0d95e03b7212bacc2b3565f12e 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,12 +1,23 @@
 class SiteController < ApplicationController
 class SiteController < ApplicationController

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

 
   def index
 
   def index

+    @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 session[:user]

-      session[:user] = User.find(session[:user].id)
-      @current_elections = session[:user].elections.sort do |a,b|
-        b.enddate <=> a.enddate
+
+      # check to see that we actually have record of them
+      if User.find_all(["id = ?", session[:user].id]).length == 1
+        # 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
     end
   end