projects
/
selectricity
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* refactored the system so that it keeps pictures in a seperate table
[selectricity]
/
app
/
controllers
/
election_controller.rb
diff --git
a/app/controllers/election_controller.rb
b/app/controllers/election_controller.rb
index a418c49337682a523fc418d9a450395ddb0c1289..7040c38c26b7acdb8ee2bc50bacb5a42c16e6909 100644
(file)
--- a/
app/controllers/election_controller.rb
+++ b/
app/controllers/election_controller.rb
@@
-1,6
+1,9
@@
class ElectionController < ApplicationController
class ElectionController < ApplicationController
- model :raw_voter_list, :voter, :vote, :candidate
- layout 'hc'
+ require_dependency "raw_voter_list"
+ require_dependency "voter"
+ require_dependency "vote"
+ require_dependency "candidate"
+ layout 'main'
#before_filter :login_required
#before_filter :login_required
@@
-9,7
+12,12
@@
class ElectionController < ApplicationController
####################################################################
def new
####################################################################
def new
+ redirect_to :action => 'general_information'
+ end
+
+ def general_information
@election = Election.new
@election = Election.new
+ render :action => 'general_information'
end
def create_election
end
def create_election
@@
-24,7
+32,7
@@
class ElectionController < ApplicationController
flash[:notice] = 'Election was successfully created.'
redirect_to :action => 'edit_candidates', :id => @election.id
else
flash[:notice] = 'Election was successfully created.'
redirect_to :action => 'edit_candidates', :id => @election.id
else
- render :action => '
new
'
+ render :action => '
general_information
'
end
end
end
end
@@
-70,9
+78,9
@@
class ElectionController < ApplicationController
def add_candidate
@election = Election.find(params[:id])
@candidate = Candidate.new(params[:candidate])
def add_candidate
@election = Election.find(params[:id])
@candidate = Candidate.new(params[:candidate])
-
+ @election.candidates << @candidate
+
if @candidate.save
if @candidate.save
- @election.candidates << @candidate
@candidate = Candidate.new
redirect_to :action => 'edit_candidates', :id => @election.id
else
@candidate = Candidate.new
redirect_to :action => 'edit_candidates', :id => @election.id
else
@@
-115,9
+123,9
@@
class ElectionController < ApplicationController
def candidate_picture
candidate = Candidate.find( params[:id] )
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
.file
type,
:disposition => 'inline' )
end
:disposition => 'inline' )
end
@@
-125,12
+133,7
@@
class ElectionController < ApplicationController
## for a particular election
####################################################################
def new_voters
## 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
end
def edit_voters
@@
-196,16
+199,16
@@
class ElectionController < ApplicationController
if incoming_voters.email == 0
new_voter.contacted = 1
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
# the new voter should be in good shape. save add to the election
- new_voter.save
@election.voters << new_voter
@election.voters << new_voter
+ new_voter.save
end
end
end
end
Benjamin Mako Hill
||
Want to submit a patch?