projects
/
selectricity
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2586291
)
Fix more DeprecationWarnings
author
John Dong
<jdong@mit.edu>
Fri, 17 Aug 2007 23:44:48 +0000
(19:44 -0400)
committer
John Dong
<jdong@mit.edu>
Fri, 17 Aug 2007 23:44:48 +0000
(19:44 -0400)
app/controllers/election_controller.rb
patch
|
blob
|
history
app/controllers/quickvote_controller.rb
patch
|
blob
|
history
app/controllers/site_controller.rb
patch
|
blob
|
history
app/controllers/voter_controller.rb
patch
|
blob
|
history
diff --git
a/app/controllers/election_controller.rb
b/app/controllers/election_controller.rb
index df0aa7c53631ab968b7d2f6bf963172645ae4f3f..d3332948b4398a197ca8280d69ec8db351ea7be2 100644
(file)
--- a/
app/controllers/election_controller.rb
+++ b/
app/controllers/election_controller.rb
@@
-1,5
+1,8
@@
class ElectionController < ApplicationController
class ElectionController < ApplicationController
- model :raw_voter_list, :voter, :vote, :candidate
+ require_dependency "raw_voter_list"
+ require_dependency "voter"
+ require_dependency "vote"
+ require_dependency "candidate"
layout 'main'
#before_filter :login_required
layout 'main'
#before_filter :login_required
diff --git
a/app/controllers/quickvote_controller.rb
b/app/controllers/quickvote_controller.rb
index 8b853ebd1a70274a5562a9d04c46ab4101153a25..41d0dc3616050ef909e39ebbcaa2eef7363da12f 100644
(file)
--- a/
app/controllers/quickvote_controller.rb
+++ b/
app/controllers/quickvote_controller.rb
@@
-1,9
+1,9
@@
class QuickvoteController < ApplicationController
layout 'main'
class QuickvoteController < ApplicationController
layout 'main'
- model :quick_voter
- model :quick_vote
- model :vote
- model :election
+ require_dependency "quick_voter"
+ require_dependency "quick_vote"
+ require_dependency "vote"
+ require_dependency "election"
#############################################################
# the following methods pertain to creating quickvotes
#############################################################
# the following methods pertain to creating quickvotes
diff --git
a/app/controllers/site_controller.rb
b/app/controllers/site_controller.rb
index a33a1fa16707403589ce4caebd0bb36161bb30d9..80fdfc406c3247b16651ae5c6b0bada8c2d35625 100644
(file)
--- a/
app/controllers/site_controller.rb
+++ b/
app/controllers/site_controller.rb
@@
-1,6
+1,8
@@
class SiteController < ApplicationController
layout 'main'
class SiteController < ApplicationController
layout 'main'
- model :user, :election, :account
+ require_dependency "user"
+ require_dependency "election"
+ require_dependency "account"
def index
@quickvotes = QuickVote.find(:all).sort {|a,b| b.enddate <=> a.enddate}[0..1]
def index
@quickvotes = QuickVote.find(:all).sort {|a,b| b.enddate <=> a.enddate}[0..1]
diff --git
a/app/controllers/voter_controller.rb
b/app/controllers/voter_controller.rb
index e94f4a76f0faed8e1994d30356c41fef851b0387..f4e0e7e7d782e9d67c13518d15758f616b8c9764 100644
(file)
--- a/
app/controllers/voter_controller.rb
+++ b/
app/controllers/voter_controller.rb
@@
-1,8
+1,8
@@
class VoterController < ApplicationController
layout 'main'
class VoterController < ApplicationController
layout 'main'
- model :voter
- model :vote
- model :election
+ require_dependency "voter"
+ require_dependency "vote"
+ require_dependency "election"
def index
password = params[:id]
def index
password = params[:id]
Benjamin Mako Hill
||
Want to submit a patch?