From: Date: Wed, 4 Jun 2008 23:28:40 +0000 (-0400) Subject: Streamlined and made more consistent the code that checks for custom skin uploads... X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/e8111bfbb23641eb8f5e6afadab6ec38e9e260c4?ds=sidebyside;hp=-c Streamlined and made more consistent the code that checks for custom skin uploads. Add theme method is still pretty ugly though. --- e8111bfbb23641eb8f5e6afadab6ec38e9e260c4 diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb index 0b529b6..68d59cc 100644 --- a/app/controllers/election_controller.rb +++ b/app/controllers/election_controller.rb @@ -46,7 +46,8 @@ class ElectionController < ApplicationController @election.anonymous = 1 @election.startdate = Time.now - unless params[:top_bar][:uploaded_data].to_s.empty? + holder = create_theme_hash + unless holder.values.all? {|v| v.has_value?("")} token_generator = UniqueTokenGenerator.new( 16 ) @election.embed_custom_string = token_generator.token add_theme(@election.embed_custom_string) @@ -60,6 +61,15 @@ class ElectionController < ApplicationController end end + def create_theme_hash + target = Hash.new + params.each do |k,v| + target[k] = v if k=="top_bar" or k=="default_image" or k=="bg1" \ + or k=="bg2" or k=="bottom_bar" + end + return target + end + # TODO add filter to verify that the person working on or looking at # something is the owner def edit_general_information @@ -69,7 +79,9 @@ class ElectionController < ApplicationController def update_general_information @election = Election.find(params[:id]) - unless (params[:top_bar][:uploaded_data].to_s.empty? and params[:default_image][:uploaded_data].to_s.empty? and params[:bg1][:uploaded_data].to_s.empty? and params[:bg2][:uploaded_data].to_s.empty? and params[:bottom_bar][:uploaded_data].to_s.empty?) + + holder = create_theme_hash + unless holder.values.all? {|v| v.has_value?("")} unless @election.embed_custom_string token_generator = UniqueTokenGenerator.new( 16 ) @election.embed_custom_string = token_generator.token @@ -86,6 +98,7 @@ class ElectionController < ApplicationController end end + #Takes care of uploading custom images -- unnecessarily long, how can I compress? def add_theme(prefix) unless params[:top_bar][:uploaded_data].to_s.empty? previous = SkinPicture.find(:first,