projects
/
selectricity-live
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A few major changes:
[selectricity-live]
/
app
/
controllers
/
site_controller.rb
diff --git
a/app/controllers/site_controller.rb
b/app/controllers/site_controller.rb
index 8d2f8b2a63c46a719efac7da711c7ad646f7e458..f2eb15343aa35cae5f29e85fde40e016b805f491 100644
(file)
--- a/
app/controllers/site_controller.rb
+++ b/
app/controllers/site_controller.rb
@@
-3,10
+3,11
@@
class SiteController < ApplicationController
model :user, :election
def index
model :user, :election
def index
- @current_elections = session[:user].elections.sort do |a,b|
- b.enddate <=> a.enddate
+ 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
-
-
end
end
end
end
Benjamin Mako Hill
||
Want to submit a patch?