From: Date: Tue, 14 Aug 2007 18:56:32 +0000 (-0400) Subject: Changed quickvotes so that they take an identifier as opposed to just a X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/b82260b129b48f9da19e73e81e1e26b89c1f53e5?hp=4ef17d5cb30800c33e325d1777cdd4ccd4611a54 Changed quickvotes so that they take an identifier as opposed to just a votename. This identifier may be either just a votename or an integer id. --- diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb index 0b745af..f5ab581 100644 --- a/app/controllers/quickvote_controller.rb +++ b/app/controllers/quickvote_controller.rb @@ -49,7 +49,7 @@ class QuickvoteController < ApplicationController ############################################################# def index - @election = QuickVote.find_all(["name = ?", params[:votename]])[0] + @election = 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 @@ -71,7 +71,7 @@ class QuickvoteController < ApplicationController unless @voter # create a new voter and populate it @voter = QuickVoter.new - @voter.election = QuickVote.find_all( [ "name = ?", params[:votename] ] )[0] + @voter.election = @election @voter.session_id = session.session_id # create new vote and make it the defaulted sorted list @@ -87,7 +87,7 @@ class QuickvoteController < ApplicationController def confirm # we need the election to verify that we have the right voter - election = QuickVote.find_all( [ "name = ?", params[:votename] ] )[0] + election = ident_to_quickvote(params[:ident]) # find out who the voter is for this election @voter = QuickVoter.find_all(["session_id = ? and election_id = ?", @@ -96,12 +96,12 @@ class QuickvoteController < ApplicationController if not @voter # we have not seen this voter before. something is wrong, try # again - redirect_to quickvote_url( :votename => params[:votename] ) + redirect_to quickvote_url( :ident => params[:ident] ) elsif @voter.voted? # this person has already voted, we try again flash[:notice] = "You have already voted!" - redirect_to quickvote_url( :votename => params[:votename] ) + redirect_to quickvote_url( :ident => params[:ident] ) else # record the ip address for posterity @@ -122,7 +122,7 @@ class QuickvoteController < ApplicationController def change voter = QuickVoter.find_all(["session_id = ?", session.session_id])[0] voter.destroy - redirect_to quickvote_url( :votename => params[:votename] ) + redirect_to quickvote_url( :ident => params[:ident] ) end def sort_candidates @@ -142,7 +142,7 @@ class QuickvoteController < ApplicationController ############################################################### def results - @election = QuickVote.find_all(["name = ?", params[:votename]] )[0] + @election = ident_to_quickvote(params[:ident]) # initalize the tallies to empty arrays preference_tally = Array.new @@ -173,4 +173,15 @@ class QuickvoteController < ApplicationController @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/views/quickvote/index.rhtml b/app/views/quickvote/index.rhtml index eb37845..e7cac3d 100644 --- a/app/views/quickvote/index.rhtml +++ b/app/views/quickvote/index.rhtml @@ -17,9 +17,9 @@

You have already voted. You can:

<% else %> @@ -38,7 +38,7 @@ bottom. When you are done, press confirm to record your vote.

-<%= button_to "Confirm Vote", quickaction_url( :action => 'confirm', :votename => @voter.election.name) %> +<%= button_to "Confirm Vote", quickaction_url( :action => 'confirm', :ident => @voter.election.name) %> <%= sortable_element 'rankings-list', :url => { :action => "sort_candidates" , :id => @voter.vote.id }, diff --git a/app/views/quickvote/success.rhtml b/app/views/quickvote/success.rhtml index d793a7a..8d2baf6 100644 --- a/app/views/quickvote/success.rhtml +++ b/app/views/quickvote/success.rhtml @@ -4,7 +4,7 @@

Please direct voters to:

- <%= quickvote_url( :votename => @quickvote.name ) -%> + <%= quickvote_url( :ident => @quickvote.name ) -%>

This vote will end on <%= @quickvote.enddate.strftime('%A, %B %d, %Y') %>

@@ -13,4 +13,4 @@ HyperChad site. Voters do not need to log in or authenticate to participate in this election.

-

<%= link_to "Jump to QuickVote", quickvote_url( :votename => @quickvote.name ) %>

+

<%= link_to "Jump to QuickVote", quickvote_url( :ident => @quickvote.name ) %>

diff --git a/app/views/quickvote/thanks.rhtml b/app/views/quickvote/thanks.rhtml index 72cfe61..1975eb7 100644 --- a/app/views/quickvote/thanks.rhtml +++ b/app/views/quickvote/thanks.rhtml @@ -12,9 +12,9 @@ preferences:

Thanks you voting! You can:

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml index eb009b3..0d59849 100644 --- a/app/views/site/index.rhtml +++ b/app/views/site/index.rhtml @@ -17,7 +17,7 @@ methods.

diff --git a/app/views/voter/_vote.rhtml b/app/views/voter/_vote.rhtml index dc240af..d144791 100644 --- a/app/views/voter/_vote.rhtml +++ b/app/views/voter/_vote.rhtml @@ -12,7 +12,7 @@ least preferred. Please list all choices in every vote. (For example, 123 or 321 or 213, etc.)

<% if @voter.election.quickvote? %> - <%= form_tag quickaction_url( :votename => @voter.election.name, :action => 'confirm') %> + <%= form_tag quickaction_url( :ident => @voter.election.name, :action => 'confirm') %> <% else %> <%= form_tag :action => 'review', :id => @voter.password %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index ee64eab..96beafd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -17,11 +17,11 @@ ActionController::Routing::Routes.draw do |map| :controller => 'quickvote', :requirements => { :action => /(create|add_candidate|sort_candidates)/ } - map.quickaction 'quickvote/:votename/:action', + map.quickaction 'quickvote/:ident/:action', :controller => 'quickvote', :requirements => { :action => /(change|confirm|results)/ } - map.quickvote 'quickvote/:votename', + map.quickvote 'quickvote/:ident', :controller => 'quickvote', :action => 'index' # Allow downloading Web Service WSDL as a file with an extension