minor changes to clustering software

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

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 68d59cc520fd1905474a12dea3991894682151af..5c13a8128cdfa6781240bc6b9937d0e533482afd 100644 (file)
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -45,6 +45,7 @@ class ElectionController < ApplicationController
     @election.user = session[:user]
     @election.anonymous = 1
     @election.startdate = Time.now
+    @election.type = 'Election'
     
     holder = create_theme_hash
     unless holder.values.all? {|v| v.has_value?("")}
@@ -79,7 +80,6 @@ class ElectionController < ApplicationController
   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
@@ -98,8 +98,10 @@ class ElectionController < ApplicationController
     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)
+    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"])
@@ -232,6 +234,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