Variety of small changes (mostly to properties) plus a few "in the

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
old mode 100644 (file)
new mode 100755 (executable)
index f4bae42..d5eab86
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,23 +1,24 @@
 class SiteController < ApplicationController
-  layout 'vb'
+  layout 'hc'
   model :user, :election
 
   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]
-      session[:user] = User.find(session[:user].id)
-      @current_elections = session[:user].elections.sort do |a,b|
-        b.enddate <=> a.enddate
-      end
-    end
-  end
 
-  def create_quickvote
-    if params[:quickvote] 
-      @quickvote = QuickVote.new(params[:quickvote])
-      if @quickvote.reviewed? and @quickvote.save
-          @quickvote = @quickvote.reload
-         render :action => 'success_quickvote'
-      end 
+      # 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].id)
+        @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