Merge my branch, which properly implements casting quickvotes

[selectricity-live] / app / apis / selectricity_api.rb

diff --git a/app/apis/selectricity_api.rb b/app/apis/selectricity_api.rb
index d478a5a8b6f9b26f5548d47cbf0683fb23ca85ac..8a8dce4d8072faca8cbc29b7e9e1d496c2a521c9 100644 (file)
--- a/app/apis/selectricity_api.rb
+++ b/app/apis/selectricity_api.rb
@@ -12,9 +12,10 @@ class CandidateMap < ActionWebService::Struct
   member :errors, [:string]
 end
 class SelectricityAPI < ActionWebService::API::Base
-  api_method :cast_quickvote, :expects => [:int, :int, [[:int]]], :returns => [:string]
+  api_method :cast_quickvote, :expects => [:string, :int, [[:int]]], :returns => [:string]
   api_method :get_quickvote_results, :expects => [:string], :returns => [VoteResultStruct]
   api_method :get_quickvote_candidate_map, :expects => [:string], :returns => [CandidateMap]
+  api_method :quickvote_candidate_ids_to_names, :expects => [:string,[:int]], :returns => [[:string]]
 end