]> projects.mako.cc - selectricity-live/blobdiff - app/controllers/site_controller.rb
Commit test case fix that restores IE6 transparency
[selectricity-live] / app / controllers / site_controller.rb
index 41eb136a3758256cd066c32cb885ba2259aed2eb..d432a03b9fb5457277d6dafc9a0660a369bd45eb 100644 (file)
@@ -1,12 +1,29 @@
 class SiteController < ApplicationController
-  layout 'vb'
-  model :user, :election
+  layout 'frontpage'
+  require_dependency "user"
+  require_dependency "election"
+  require_dependency "account"
+  include Sitealizer
+  before_filter :use_sitealizer
 
   def index
-    if session[:user]
-      session[:user] = User.find(session[:user].id)
-      @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

Benjamin Mako Hill || Want to submit a patch?