Scrollbar if someone creates too many electons to fit within defualt given room for...

[selectricity] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 68d59cc520fd1905474a12dea3991894682151af..be2fb3d2c9efd26c5deb6e8ee150249b5e509ac2 100644 (file)
--- 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])
     
   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
     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
   
     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)
   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"])
     unless params[:top_bar][:uploaded_data].to_s.empty?
       previous = SkinPicture.find(:first,
       :conditions => ["filename = ?", @election.embed_custom_string + "top_bar.png"])