First major stab at the integration of Courtland's CSS into

[selectricity] / app / controllers / quickvote_controller.rb

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index c2ed0559659e4995f7ccbb53aecd74aef41b81eb..cd63c2e52f61245f2d6b0b537cfb56b624e4d0b2 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -17,6 +17,8 @@ class QuickvoteController < ApplicationController
       @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
@@ -178,6 +180,9 @@ class QuickvoteController < ApplicationController
       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}