jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #1118

Browse Source
This commit is contained in:
Toks
2013-04-22 22:03:48 -04:00
parent 7c51a7daa8
commit 3ef06e555b
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/forum_posts_controller.rb
View File

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

7
app/views/forum_posts/index.html.erb
View File

@@ -13,7 +13,12 @@
<% @forum_posts.each do |forum_post| %> <% @forum_posts.each do |forum_post| %>
<tr> <tr>
<td><%= link_to forum_post.topic.title, forum_topic_path(forum_post.topic) %></td> <td><%= link_to forum_post.topic.title, forum_topic_path(forum_post.topic) %></td>
<td><%= link_to truncate(forum_post.body, :length => 50), forum_post_path(forum_post) %></td> <td>
<%= link_to truncate(forum_post.body, :length => 50), forum_post_path(forum_post) %>
<% if forum_post.is_deleted? %>
(deleted)
<% end %>
</td>
<td><%= link_to_user forum_post.creator %></td> <td><%= link_to_user forum_post.creator %></td>
<td><%= time_ago_in_words_tagged forum_post.created_at %></td> <td><%= time_ago_in_words_tagged forum_post.created_at %></td>
</tr> </tr>