added first stab at a kiosk mode

[selectricity] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 68d59cc520fd1905474a12dea3991894682151af..ad74a1b211de62a91b37a41e46e5756ab6fe8709 100644 (file)
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -2,19 +2,8 @@
 # Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
 # Copyright (C) 2007 Massachusetts Institute of Technology
 #
 # Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
 # Copyright (C) 2007 Massachusetts Institute of Technology
 #

-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# This program is free software. Please see the COPYING file for
+# details.

 
 class ElectionController < ApplicationController
   require_dependency "raw_voter_list"
 
 class ElectionController < ApplicationController
   require_dependency "raw_voter_list"


@@ -45,6 +34,7 @@ class ElectionController < ApplicationController
     @election.user = session[:user]
     @election.anonymous = 1
     @election.startdate = Time.now
     @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?("")}
     
     holder = create_theme_hash
     unless holder.values.all? {|v| v.has_value?("")}


@@ -79,7 +69,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 +87,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"])


@@ -158,7 +149,7 @@ class ElectionController < ApplicationController
                                         :locals => { :page => 'review' }
 
     @election = Election.find(params[:id])
                                         :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
       
       redirect_to(:controller => 'quickvote', :action => 'index', :ident => @election.id)
     end
       


@@ -232,11 +223,12 @@ class ElectionController < ApplicationController
     if params.has_key?( :raw_voter_list )
       process_incoming_voters( params[:raw_voter_list] )
     end
     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
     @raw_voter_list = RawVoterList.new
   end
   
   def delete_voter

-    voter = Voter.find( params[:id] )
+    voter = FullVoter.find( params[:id] )

     voter.destroy
   end
 
     voter.destroy
   end