projects
/
selectricity-live
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Created a partial to DRY the aja voting method. Modified the voter class to
[selectricity-live]
/
app
/
controllers
/
election_controller.rb
diff --git
a/app/controllers/election_controller.rb
b/app/controllers/election_controller.rb
index 570f1fc3687a4162428555d06829544074d74b93..fa1313cb68cecdd0f06d8c5c8ff14f9004f8ab9c 100644
(file)
--- a/
app/controllers/election_controller.rb
+++ b/
app/controllers/election_controller.rb
@@
-60,8
+60,8
@@
class ElectionController < ApplicationController
def start_election
@election = Election.find(params[:id])
def start_election
@election = Election.find(params[:id])
-
@election.voters.each do |voter|
@election.voters.each do |voter|
+ voter.vote = Vote.new
email = VoterNotify.deliver_votestart(voter)
#render(:text => "<pre>" + email.encoded + "</pre>")
end
email = VoterNotify.deliver_votestart(voter)
#render(:text => "<pre>" + email.encoded + "</pre>")
end
@@
-69,15
+69,6
@@
class ElectionController < ApplicationController
@election.activate!
redirect_to :action => 'show', :id => @election.id
end
@election.activate!
redirect_to :action => 'show', :id => @election.id
end
-
- def change_notices
- election = Election.find(params[:id])
- if election.notices == 0
- election.notices = 1
- else
- election.notices = 0
- end
- end
# methods fod display, adding, deleting, and manipulating candidate
# information for elections
# methods fod display, adding, deleting, and manipulating candidate
# information for elections
@@
-108,13
+99,13
@@
class ElectionController < ApplicationController
def lessinfo_candidate
@show_details = false
def lessinfo_candidate
@show_details = false
- @candidate = Candidate.find( params[:id] )
+ @c
urrent_c
andidate = Candidate.find( params[:id] )
render :partial => 'candidate_line'
end
def moreinfo_candidate
@show_details = true
render :partial => 'candidate_line'
end
def moreinfo_candidate
@show_details = true
- @candidate = Candidate.find( params[:id] )
+ @c
urrent_c
andidate = Candidate.find( params[:id] )
render :partial => 'candidate_line'
end
render :partial => 'candidate_line'
end
@@
-192,7
+183,7
@@
class ElectionController < ApplicationController
@election.voters. each do |voter|
if voter.vote and voter.vote.confirmed?
@voter_list << voter.email
@election.voters. each do |voter|
if voter.vote and voter.vote.confirmed?
@voter_list << voter.email
- @vote_list << voter.vote
+
@vote_list << voter.vote
end
end
end
end
@@
-209,7
+200,7
@@
class ElectionController < ApplicationController
unless incoming_voters.entries.empty?
incoming_voters.each do |new_voter|
unless incoming_voters.entries.empty?
incoming_voters.each do |new_voter|
-
+
if incoming_voters.email == 0
new_voter.contacted = 1
elsif incoming_voters.email == 1
if incoming_voters.email == 0
new_voter.contacted = 1
elsif incoming_voters.email == 1
Benjamin Mako Hill
||
Want to submit a patch?