cleaned up minor issues from testing embeddable code

[selectricity] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 5949f567746444df5208f73913263e945a32bc40..94c203d104c902de9dd673a3713ad0c2e76a9fa7 100644 (file)
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -54,20 +54,13 @@ class ElectionController < ApplicationController
     end
   end
   
     end
   end
   

-  # add filter to verify that the person working on or looking at
+  # TODO add filter to verify that the person working on or looking at

   # something is the owner
   # something is the owner

-  def edit
+  def edit_general_information

     @election = Election.find(params[:id])
   end
     @election = Election.find(params[:id])
   end

-
-  def show
-    @sidebar_content = render_to_string :partial => 'progress',
-                                        :locals => { :page => 'review' }
-
-    @election = Election.find(params[:id])
-  end
-
-  def update
+  
+  def update_general_information

     @election = Election.find(params[:id])
     if @election.update_attributes(params[:election])
       flash[:notice] = 'Election was successfully updated.'
     @election = Election.find(params[:id])
     if @election.update_attributes(params[:election])
       flash[:notice] = 'Election was successfully updated.'


@@ -77,6 +70,14 @@ class ElectionController < ApplicationController
     end
   end
 
     end
   end
 

+
+  def show
+    @sidebar_content = render_to_string :partial => 'progress',
+                                        :locals => { :page => 'review' }
+
+    @election = Election.find(params[:id])
+  end
+

   def start_election
     @election = Election.find(params[:id])
     @election.voters.each do |voter|
   def start_election
     @election = Election.find(params[:id])
     @election.voters.each do |voter|


@@ -103,6 +104,12 @@ class ElectionController < ApplicationController
     @election.candidates << @candidate
 
     if @candidate.save
     @election.candidates << @candidate
 
     if @candidate.save

+      # check to see if they've uploaded a picture
+      if params[:picture][:uploaded_data]
+        picture = Picture.new(params[:picture])
+        @candidate.picture = picture if picture.save
+      end
+

       @candidate = Candidate.new
       redirect_to :action => 'edit_candidates', :id => @election.id
     else
       @candidate = Candidate.new
       redirect_to :action => 'edit_candidates', :id => @election.id
     else


@@ -145,6 +152,16 @@ class ElectionController < ApplicationController
     voter = Voter.find( params[:id] )
     voter.destroy
   end
     voter = Voter.find( params[:id] )
     voter.destroy
   end

+
+  def toggle_authenticated
+    @election = Election.find(params[:id])
+    if params[:authenticated] == "1"
+      @election.authenticated = true
+    else
+      @election.authenticated = false
+    end
+    @election.save
+  end

   
   ## methods for computing and printing results
   ####################################################################
   
   ## methods for computing and printing results
   ####################################################################