X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/548d6f3789d5b07aa259444acc816a4e98452f2b..324eefe8bfad16a101fa03a7ee545e7c66fe338c:/app/controllers/election_controller.rb?ds=inline

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 4e59ca8..072d439 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
     
@@ -84,28 +89,28 @@ class ElectionController < ApplicationController
   def add_theme(prefix)
     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.filename = prefix + "top_bar." + params[:top_bar][:uploaded_data].content_type[6..-2]
+      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.filename = prefix + "default_image." + params[:default_image][:uploaded_data].content_type[6..-2]
+      default_image.save
     end
     unless params[:bg1][:uploaded_data].to_s.empty?
-      bg1 = SkinPicture.new(params[:bg1])
-      bg1.filename = prefix + "bg1"
-      bg1.save!
+      bg1 = SkinPicture.new(params[:bg1])  
+      bg1.filename = prefix + "bg1." + params[:bg1][:uploaded_data].content_type[6..-2]
+      bg1.save
     end
     unless params[:bg2][:uploaded_data].to_s.empty?
-      bg2 = SkinPicture.new(params[:bg2])
-      bg2.filename = prefix + "bg2"
-      bg2.save!
+      bg2 = SkinPicture.new(params[:bg2]) 
+      bg2.filename = prefix + "bg2." + params[:bg2][:uploaded_data].content_type[6..-2]
+      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.filename = prefix + "bottom_bar." + params[:bottom_bar][:uploaded_data].content_type[6..-2]
+      bottom_bar.save
     end
         
   end