From: John Dong Date: Tue, 14 Aug 2007 20:50:49 +0000 (-0400) Subject: Refactor the ident_to_quickvote method as a classmethod of the model X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/c992f015ed80cab29bd0f4b6cdd0ddbc1d00d304 Refactor the ident_to_quickvote method as a classmethod of the model --- diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb index acbf012..83a6cc5 100644 --- a/app/controllers/quickvote_controller.rb +++ b/app/controllers/quickvote_controller.rb @@ -49,7 +49,7 @@ class QuickvoteController < ApplicationController ############################################################# 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 @@ -87,7 +87,7 @@ class QuickvoteController < ApplicationController 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 = ?", @@ -142,21 +142,9 @@ class QuickvoteController < ApplicationController ############################################################### 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 - - 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 diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb index 6259784..5f566c6 100644 --- a/app/models/quick_vote.rb +++ b/app/models/quick_vote.rb @@ -74,4 +74,15 @@ class QuickVote < Election end + + ### Convert a shortname or id into a QuickVote + def self.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