From: Date: Thu, 29 May 2008 20:38:15 +0000 (-0400) Subject: save! changed to save for add_theme method, and a check to give the election an embed... X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/00e87082306d6cfaafe9f190de28ed9bd1d13b09?ds=inline;hp=548d6f3789d5b07aa259444acc816a4e98452f2b save! changed to save for add_theme method, and a check to give the election an embed_custom_string was added to the edit method, in case they decide they want to give it a theme later. --- diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb index 4e59ca8..2337232 100644 --- a/app/controllers/election_controller.rb +++ b/app/controllers/election_controller.rb @@ -70,6 +70,11 @@ class ElectionController < ApplicationController @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?) + unless @election.embed_custom.string + token_generator = UniqueTokenGenerator.new( 16 ) + @election.embed_custom_string = token_generator.token + end + add_theme(@election.embed_custom_string) end @@ -85,27 +90,27 @@ class ElectionController < ApplicationController unless params[:top_bar][:uploaded_data].to_s.empty? top_bar = SkinPicture.new(params[:top_bar]) top_bar.filename = prefix + "top_bar" - top_bar.save! + top_bar.save end unless params[:default_image][:uploaded_data].to_s.empty? default_image = SkinPicture.new(params[:default_image]) default_image.filename = prefix + "default_image" - default_image.save! + default_image.save end unless params[:bg1][:uploaded_data].to_s.empty? bg1 = SkinPicture.new(params[:bg1]) bg1.filename = prefix + "bg1" - bg1.save! + bg1.save end unless params[:bg2][:uploaded_data].to_s.empty? bg2 = SkinPicture.new(params[:bg2]) bg2.filename = prefix + "bg2" - bg2.save! + bg2.save end unless params[:bottom_bar][:uploaded_data].to_s.empty? bottom_bar = SkinPicture.new(params[:bottom_bar]) bottom_bar.filename = prefix + "bottom_bar" - bottom_bar.save! + bottom_bar.save end end