This commit is contained in:
Toks
2013-07-07 19:29:24 -04:00
parent fc3aac28b8
commit 39a6cca62a
6 changed files with 16 additions and 14 deletions

View File

@@ -16,11 +16,11 @@ class ForumPostsController < ApplicationController
def index
if CurrentUser.is_janitor?
@search = ForumPost.search(params[:search])
@query = ForumPost.search(params[:search])
else
@search = ForumPost.active.search(params[:search])
@query = ForumPost.active.search(params[:search])
end
@forum_posts = @search.order("forum_posts.id DESC").paginate(params[:page], :limit => params[:limit], :search_count => params[:search])
@forum_posts = @query.order("forum_posts.id DESC").paginate(params[:page], :limit => params[:limit], :search_count => params[:search])
respond_with(@forum_posts) do |format|
format.xml do
render :xml => @forum_posts.to_xml(:root => "forum-posts")