X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/6d422530319d9fbacc37c271e22778d07414f0da..4efa3e9bc47cc649205a399fde51ed7e61bef7f8:/app/controllers/election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 625ce93..f4b89b4 100644
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -4,35 +4,22 @@ class ElectionController < ApplicationController
 
   before_filter :login_required
 
-  ## general methods for dealing with elections
-  ####################################################################
-  def index
-    list
-    render :action => 'list'
-  end
-
-  def list
-    @election_pages, @elections = paginate :elections, :per_page => 10
-  end
-
   ## methods for displaying, creating,
   ## and manipulating election overview data
   ####################################################################
 
-  def show
-    @election = Election.find(params[:id])
-  end
-
   def new
     @election = Election.new
   end
   
-  def edit
-    @election = Election.find(params[:id])
-  end
-
   def create_election
     @election = Election.new(params[:election])
+    
+    # default options
+    @election.user = session[:user]
+    @election.anonymous = 1
+    @election.startdate = Time.now
+
     if @election.save
       flash[:notice] = 'Election was successfully created.'
       redirect_to :action => 'new_candidates', :id => @election.id
@@ -40,6 +27,16 @@ class ElectionController < ApplicationController
       render :action => 'new'
     end
   end
+  
+  # add filter to verify that the person working on or looking at
+  # something is the owner
+  def edit
+    @election = Election.find(params[:id])
+  end
+
+  def show
+    @election = Election.find(params[:id])
+  end
 
   def update
     @election = Election.find(params[:id])
@@ -66,7 +63,9 @@ class ElectionController < ApplicationController
   def add_candidate
     election = Election.find( params[:id] )
     @candidate = Candidate.new
-    @candidate.name = params[:newcandidate] 
+    @candidate.name = params[:newcandidate][:name]
+    @candidate.description = params[:newcandidate][:description]
+    
     @candidate.save
     election.candidates << @candidate
     render :partial => 'candidate_line'