fixed bug introduced in vote.rb and added pagination to visitors controllers index action

Ábner Silva de Oliveira
1 parent 739bcd4c
Showing 2 changed files with 17 additions and 3 deletions Show diff stats
app/controllers/visitors_controller.rb
app/models/vote.rb
+require 'will_paginate/array'
+
 class VisitorsController < InheritedResources::Base
         respond_to :xml, :json
 	before_filter :authenticate
   actions :index
   def index
-    cond = params[:question_id] ? "question_id = #{params[:question_id]}" : nil
-
+    cond = nil
+    if params[:question_id]
+      Question.find(params[:question_id])
+      cond = "question_id = #{params[:question_id]}"
+    end
     counts = {}
     if params[:votes_count]
       counts[:votes_count] = Vote.count(:conditions => cond, :group => "voter_id")
@@ -41,7 +46,15 @@ class VisitorsController &lt; InheritedResources::Base
     counts.each_pair do |attr,values|
       @visitors.each{ |v| v[attr] = values[v.id] || 0 }
     end
+
+    if(params[:page])
+       @visitors = WillPaginate::Collection.create(params[:page], params[:page_size] || 10, @visitors.length) do |pager|
+        result = @visitors.slice(pager.offset, pager.per_page)
+        result ? pager.replace(result) : nil
+      end
+    end
+
     index!
   end
+require 'will_paginate'
 class Vote < ActiveRecord::Base
 #  belongs_to :voteable, :polymorphic => true, :counter_cache => true
   validates_presence_of :question
@@ -19,7 +20,7 @@ class Vote &lt; ActiveRecord::Base
   named_scope :active, :include => :choice, :conditions => { 'choices.active' => true }
   named_scope :active_loser, :include => :loser_choice, :conditions => { 'choices.active' => true }
-  default_scope :conditions => {"#{table_name}.valid_record"  => true }
+  default_scope :conditions => {"valid_record"  => true }
   serialize :tracking