added unapproval+upload functional test

2011-01-31 18:01:48 -05:00
parent 28b42e791c
commit df20d9233b
13 changed files with 174 additions and 9 deletions
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -11,7 +11,8 @@ class UploadsController < ApplicationController
  end
  
  def index
-    @uploads = Upload.where("uploader_id = ?", CurrentUser.user.id).includes(:uploader).order("uploads.id desc").limit(10)
+    @search = Upload.search(params[:search])
+    @uploads = @search.paginate(:page => params[:page])
    respond_with(@uploads)
  end