X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/729d45807f8d8e179e4a723c304336e1945acf67..68d36148578a124acbf34f5da6893b0a62663699:/app/controllers/election_controller.rb diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb index d333294..4ad8bac 100644 --- a/app/controllers/election_controller.rb +++ b/app/controllers/election_controller.rb @@ -12,7 +12,12 @@ class ElectionController < ApplicationController #################################################################### def new + redirect_to :action => 'general_information' + end + + def general_information @election = Election.new + render :action => 'general_information' end def create_election @@ -27,7 +32,7 @@ class ElectionController < ApplicationController flash[:notice] = 'Election was successfully created.' redirect_to :action => 'edit_candidates', :id => @election.id else - render :action => 'new' + render :action => 'general_information' end end @@ -62,6 +67,15 @@ class ElectionController < ApplicationController @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 @@ -73,9 +87,9 @@ class ElectionController < ApplicationController def add_candidate @election = Election.find(params[:id]) @candidate = Candidate.new(params[:candidate]) - + @election.candidates << @candidate + if @candidate.save - @election.candidates << @candidate @candidate = Candidate.new redirect_to :action => 'edit_candidates', :id => @election.id else @@ -118,9 +132,9 @@ class ElectionController < ApplicationController def candidate_picture candidate = Candidate.find( params[:id] ) - send_data( candidate.picture_data, - :filename => candidate.picture_filename, - :type => candidate.picture_type, + send_data( candidate.picture.data, + :filename => candidate.picture.filename, + :type => candidate.picture.filetype, :disposition => 'inline' ) end @@ -128,12 +142,7 @@ class ElectionController < ApplicationController ## for a particular election #################################################################### def new_voters - @election = Election.find( params[:id] ) - if params.has_key?[:raw_voter_list] - process_incoming_voters( params[:raw_voter_list] ) - end - @raw_voter_list = RawVoterList.new - + edit_voters end def edit_voters @@ -207,8 +216,8 @@ class ElectionController < ApplicationController end # the new voter should be in good shape. save add to the election - new_voter.save @election.voters << new_voter + new_voter.save end end