X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/e8111bfbb23641eb8f5e6afadab6ec38e9e260c4..79b260d1caad8ef8559a9d8a9c46068acafdf9fb:/app/controllers/election_controller.rb diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb index 68d59cc..3e16964 100644 --- a/app/controllers/election_controller.rb +++ b/app/controllers/election_controller.rb @@ -79,7 +79,6 @@ class ElectionController < ApplicationController def update_general_information @election = Election.find(params[:id]) - holder = create_theme_hash unless holder.values.all? {|v| v.has_value?("")} unless @election.embed_custom_string @@ -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