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
old mode 100755 (executable)
new mode 100644 (file)
index d5eab86..dd049f7
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,6 +1,6 @@
 class SiteController < ApplicationController
   layout 'hc'
 class SiteController < ApplicationController
   layout 'hc'

-  model :user, :election
+  model :user, :election, :account

 
   def index
     @quickvotes = QuickVote.find_all(["quickvote = 1"]).sort {|a,b| b.enddate <=> a.enddate}[0..1]
 
   def index
     @quickvotes = QuickVote.find_all(["quickvote = 1"]).sort {|a,b| b.enddate <=> a.enddate}[0..1]


@@ -10,7 +10,7 @@ class SiteController < ApplicationController
       # 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
       # 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)
+        session[:user] = User.find(session[:user])

         @current_elections = session[:user].elections.sort do |a,b|
           b.enddate <=> a.enddate
         end
         @current_elections = session[:user].elections.sort do |a,b|
           b.enddate <=> a.enddate
         end