projects
/
selectricity
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed errors with election/class
[selectricity]
/
app
/
controllers
/
election_controller.rb
diff --git
a/app/controllers/election_controller.rb
b/app/controllers/election_controller.rb
index be2fb3d2c9efd26c5deb6e8ee150249b5e509ac2..ccbbafe282bb2add4fc809c246f69a60b6bb04fb 100644
(file)
--- a/
app/controllers/election_controller.rb
+++ b/
app/controllers/election_controller.rb
@@
-45,6
+45,7
@@
class ElectionController < ApplicationController
@election.user = session[:user]
@election.anonymous = 1
@election.startdate = Time.now
@election.user = session[:user]
@election.anonymous = 1
@election.startdate = Time.now
+ @election.type = 'Election'
holder = create_theme_hash
unless holder.values.all? {|v| v.has_value?("")}
holder = create_theme_hash
unless holder.values.all? {|v| v.has_value?("")}
@@
-159,7
+160,7
@@
class ElectionController < ApplicationController
:locals => { :page => 'review' }
@election = Election.find(params[:id])
:locals => { :page => 'review' }
@election = Election.find(params[:id])
- if @election.
type
== QuickVote
+ if @election.
class
== QuickVote
redirect_to(:controller => 'quickvote', :action => 'index', :ident => @election.id)
end
redirect_to(:controller => 'quickvote', :action => 'index', :ident => @election.id)
end
@@
-233,6
+234,7
@@
class ElectionController < ApplicationController
if params.has_key?( :raw_voter_list )
process_incoming_voters( params[:raw_voter_list] )
end
if params.has_key?( :raw_voter_list )
process_incoming_voters( params[:raw_voter_list] )
end
+ @edit = true
@raw_voter_list = RawVoterList.new
end
@raw_voter_list = RawVoterList.new
end
Benjamin Mako Hill
||
Want to submit a patch?