projects
/
selectricity-live
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor the ident_to_quickvote method as a classmethod of the model
[selectricity-live]
/
app
/
controllers
/
quickvote_controller.rb
diff --git
a/app/controllers/quickvote_controller.rb
b/app/controllers/quickvote_controller.rb
index acbf012ff5cb3df503371f59f4b8d71c466e567f..83a6cc5fc659e5bcfabcc75a1d6e31baa7af5474 100644
(file)
--- a/
app/controllers/quickvote_controller.rb
+++ b/
app/controllers/quickvote_controller.rb
@@
-49,7
+49,7
@@
class QuickvoteController < ApplicationController
#############################################################
def index
#############################################################
def index
- @election = ident_to_quickvote(params[:ident])
+ @election =
QuickVote.
ident_to_quickvote(params[:ident])
# if the person has specified an election, we show them the voting
# page. otherwise, we redirect back to main the page
# if the person has specified an election, we show them the voting
# page. otherwise, we redirect back to main the page
@@
-87,7
+87,7
@@
class QuickvoteController < ApplicationController
def confirm
# we need the election to verify that we have the right voter
def confirm
# we need the election to verify that we have the right voter
- election = ident_to_quickvote(params[:ident])
+ election =
QuickVote.
ident_to_quickvote(params[:ident])
# find out who the voter is for this election
@voter = QuickVoter.find_all(["session_id = ? and election_id = ?",
# find out who the voter is for this election
@voter = QuickVoter.find_all(["session_id = ? and election_id = ?",
@@
-142,21
+142,9
@@
class QuickvoteController < ApplicationController
###############################################################
def results
###############################################################
def results
- @election = ident_to_quickvote(params[:ident])
+ @election =
QuickVote.
ident_to_quickvote(params[:ident])
@election.results
@candidates = {}
@election.candidates.each {|c| @candidates[c.id] = c}
end
@election.results
@candidates = {}
@election.candidates.each {|c| @candidates[c.id] = c}
end
-
- private
- def ident_to_quickvote(ident)
- if ident.match(/^\d+$/)
- quickvote = QuickVote.find(ident)
- else
- quickvote = QuickVote.find_all(["name = ?", ident])[0]
- end
-
- return quickvote
- end
-
end
end
Benjamin Mako Hill
||
Want to submit a patch?