save! changed to save for add_theme method, and a check to give the election an embed...

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 4e59ca8d56a9c0836c69c12bfd5abd3a097126b6..23372324432cf6046c2028742cbd463193d2e264 100644 (file)
--- 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?)
     @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
     
       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"
     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"
     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"
     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"
     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"
     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
     end
         
   end