projects
/
selectricity
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First major stab at the integration of Courtland's CSS into
[selectricity]
/
app
/
controllers
/
site_controller.rb
diff --git
a/app/controllers/site_controller.rb
b/app/controllers/site_controller.rb
index 47ae2cbd87af5dbde48f59c1fdbb6feb44c92f4d..522bbb2cf4dbe3b5e26145a9040b233ac3732187 100644
(file)
--- a/
app/controllers/site_controller.rb
+++ b/
app/controllers/site_controller.rb
@@
-1,22
+1,27
@@
class SiteController < ApplicationController
class SiteController < ApplicationController
- layout 'hc'
- model :user, :election
+ layout 'frontpage'
+ require_dependency "user"
+ require_dependency "election"
+ require_dependency "account"
def index
def index
+ @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
@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
+ # if we have no record of them, set the
user
back to
+
# nothing and start again
session[:user] = nil
session[:user] = nil
+
end
end
end
end
end
end
Benjamin Mako Hill
||
Want to submit a patch?