X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/07ff860387aed826ff4046f16a27324c58e4fb3d..79b260d1caad8ef8559a9d8a9c46068acafdf9fb:/app/controllers/election_controller.rb diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb index 7f87b2e..3e16964 100644 --- a/app/controllers/election_controller.rb +++ b/app/controllers/election_controller.rb @@ -46,7 +46,6 @@ class ElectionController < ApplicationController @election.anonymous = 1 @election.startdate = Time.now - holder = create_theme_hash unless holder.values.all? {|v| v.has_value?("")} token_generator = UniqueTokenGenerator.new( 16 ) @@ -98,8 +97,10 @@ class ElectionController < ApplicationController end end - #Takes care of uploading custom images -- unnecessarily long, how can I compress? + #Takes care of uploading custom images + #unnecessarily long, how can I compress? def add_theme(prefix) + holder = create_theme_hash unless params[:top_bar][:uploaded_data].to_s.empty? previous = SkinPicture.find(:first, :conditions => ["filename = ?", @election.embed_custom_string + "top_bar.png"]) @@ -232,6 +233,7 @@ class ElectionController < ApplicationController if params.has_key?( :raw_voter_list ) process_incoming_voters( params[:raw_voter_list] ) end + @edit = true @raw_voter_list = RawVoterList.new end