X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/fc0a6a8d7ea15bcdb27ebdd58721401c7045c6e0..09c67d9323c7d379d4c6de5dc0457b6de16cff14:/app/controllers/election_controller.rb diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb old mode 100755 new mode 100644 index 3a43c8e..df0aa7c --- a/app/controllers/election_controller.rb +++ b/app/controllers/election_controller.rb @@ -1,8 +1,8 @@ class ElectionController < ApplicationController model :raw_voter_list, :voter, :vote, :candidate - layout 'hc' + layout 'main' - before_filter :login_required + #before_filter :login_required ## methods for displaying, creating, ## and manipulating election overview data @@ -196,15 +196,15 @@ class ElectionController < ApplicationController if incoming_voters.email == 0 new_voter.contacted = 1 - elsif incoming_voters.email == 1 - email_voter( new_voter ) - new_voter.contacted = 1 - else - new_voter.contacted = 0 - end + elsif incoming_voters.email == 1 + email_voter( new_voter ) + new_voter.contacted = 1 + else + new_voter.contacted = 0 + end # the new voter should be in good shape. save add to the election - new_voter.save + new_voter.save @election.voters << new_voter end end