changed images on the front page and added new headings

[selectricity] / app / controllers / quickvote_controller.rb

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index e675638f2af35b619c967560fb32eae5fc3613fd..cd63c2e52f61245f2d6b0b537cfb56b624e4d0b2 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -10,11 +10,15 @@ class QuickvoteController < ApplicationController
   #############################################################
 
   def create
   #############################################################
 
   def create

-    if params[:quickvote] 
+    if params[:quickvote]

       @quickvote = QuickVote.new(params[:quickvote])
       # store the candidate grabbed through ajax and stored in flash
       @quickvote.candidate_names = flash[:candidate_names]
       @quickvote.description=@quickvote.description
       @quickvote = QuickVote.new(params[:quickvote])
       # store the candidate grabbed through ajax and stored in flash
       @quickvote.candidate_names = flash[:candidate_names]
       @quickvote.description=@quickvote.description

+      #record who created the quickvote so that person can monitor it easily
+      @quickvote.quickuser = session.session_id
+      #Give registered users additional QuickVote functionality 
+      @quickvote.user_id = session[:user][:id] if session[:user]

       # try to save, if it fails, show the page again (the flash should
       # still be intact
       if @quickvote.save
       # try to save, if it fails, show the page again (the flash should
       # still be intact
       if @quickvote.save


@@ -176,11 +180,18 @@ class QuickvoteController < ApplicationController
       redirect_to :controller => 'site'
       return
     end
       redirect_to :controller => 'site'
       return
     end

+    if @election.viewable == 0 && @election.active == 1
+      render :action => 'not_viewable' and return
+    end

     @results = @election.results
     @candidates = {}
     @election.candidates.each {|c| @candidates[c.id] = c}
   end
   
     @results = @election.results
     @candidates = {}
     @election.candidates.each {|c| @candidates[c.id] = c}
   end
   

+  def my_quickvotes
+    @myqvs = QuickVote.find(:all, :conditions => ["quickuser = ?",
+                                session.session_id])
+  end

   
 end
 
   
 end