An @edit=true declaration was missing from edit_voters that prevented the voter delet...

[selectricity-live] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 23372324432cf6046c2028742cbd463193d2e264..3e169646bac4d583087fc585c36304fc186f9999 100644 (file)
--- 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,8 +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?)
-      unless @election.embed_custom.string
+    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
       end
@@ -86,30 +97,58 @@ class ElectionController < ApplicationController
     end
   end
   
+  #Takes care of uploading custom images 
+  #unnecessarily long, how can I compress?
   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"])
+      if previous
+        previous.destroy
+      end
       top_bar = SkinPicture.new(params[:top_bar])
-      top_bar.filename = prefix + "top_bar"
+      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?
+      previous = SkinPicture.find(:first,
+      :conditions => ["filename = ?", @election.embed_custom_string + "default_image.png"])
+      if previous
+        previous.destroy
+      end
       default_image = SkinPicture.new(params[:default_image])
-      default_image.filename = prefix + "default_image"
+      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"
+      previous = SkinPicture.find(:first,
+      :conditions => ["filename = ?", @election.embed_custom_string + "bg1.png"])
+      if previous
+        previous.destroy
+      end
+      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"
+      previous = SkinPicture.find(:first,
+      :conditions => ["filename = ?", @election.embed_custom_string + "bg2.png"])
+      if previous
+        previous.destroy
+      end
+      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?
+      previous = SkinPicture.find(:first,
+      :conditions => ["filename = ?", @election.embed_custom_string + "bottom_bar.png"])
+      if previous
+        previous.destroy
+      end
       bottom_bar = SkinPicture.new(params[:bottom_bar])
-      bottom_bar.filename = prefix + "bottom_bar"
+      bottom_bar.filename = prefix + "bottom_bar." + params[:bottom_bar][:uploaded_data].content_type[6..-2]
       bottom_bar.save
     end
         
@@ -194,6 +233,7 @@ class ElectionController < ApplicationController
     if params.has_key?( :raw_voter_list )
       process_incoming_voters( params[:raw_voter_list] )
     end
+    @edit = true
     @raw_voter_list = RawVoterList.new
   end