improved dependency information

[selectricity] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 0b529b6f4630d76d8a7f6920c36bf24c15684d7c..3d811e622112f32ab59b6c5fc075a5a21d9c60da 100644 (file)
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -45,8 +45,10 @@ class ElectionController < ApplicationController
     @election.user = session[:user]
     @election.anonymous = 1
     @election.startdate = Time.now
+    @election.type = 'Election'
     
-    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 +62,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,7 +80,8 @@ 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?)
+    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
@@ -86,7 +98,10 @@ 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"])
@@ -145,7 +160,7 @@ class ElectionController < ApplicationController
                                         :locals => { :page => 'review' }
 
     @election = Election.find(params[:id])
-    if @election.type == QuickVote
+    if @election.class  == QuickVote
       redirect_to(:controller => 'quickvote', :action => 'index', :ident => @election.id)
     end
       
@@ -219,11 +234,12 @@ 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
   
   def delete_voter
-    voter = Voter.find( params[:id] )
+    voter = FullVoter.find( params[:id] )
     voter.destroy
   end