diff --git a/app/controllers/post_appeals_controller.rb b/app/controllers/post_appeals_controller.rb index 2f0bfd469..e11a73569 100644 --- a/app/controllers/post_appeals_controller.rb +++ b/app/controllers/post_appeals_controller.rb @@ -8,8 +8,8 @@ class PostAppealsController < ApplicationController end def index - @query = PostAppeal.order("post_appeals.id desc").includes(:post).search(params[:search]) - @post_appeals = @query.paginate(params[:page], :limit => params[:limit]) + @post_appeals = PostAppeal.includes(:creator).search(params[:search]).includes(post: [:appeals, :uploader, :approver]) + @post_appeals = @post_appeals.paginate(params[:page], limit: params[:limit]) respond_with(@post_appeals) do |format| format.xml do render :xml => @post_appeals.to_xml(:root => "post-appeals") diff --git a/app/controllers/post_flags_controller.rb b/app/controllers/post_flags_controller.rb index 1649d5fc2..2c4813eb7 100644 --- a/app/controllers/post_flags_controller.rb +++ b/app/controllers/post_flags_controller.rb @@ -8,8 +8,8 @@ class PostFlagsController < ApplicationController end def index - @query = PostFlag.order("id desc").search(params[:search]) - @post_flags = @query.paginate(params[:page], :limit => params[:limit]) + @post_flags = PostFlag.search(params[:search]).includes(:creator, post: [:flags, :uploader, :approver]) + @post_flags = @post_flags.paginate(params[:page], limit: params[:limit]) respond_with(@post_flags) do |format| format.xml do render :xml => @post_flags.to_xml(:root => "post-flags") diff --git a/app/models/post_appeal.rb b/app/models/post_appeal.rb index ccec459fd..a47fc08ee 100644 --- a/app/models/post_appeal.rb +++ b/app/models/post_appeal.rb @@ -37,7 +37,7 @@ class PostAppeal < ActiveRecord::Base end def search(params) - q = where("true") + q = order("post_appeals.id desc") return q if params.blank? if params[:reason_matches].present? diff --git a/app/models/post_flag.rb b/app/models/post_flag.rb index 033f34b2f..0b8fbeee5 100644 --- a/app/models/post_flag.rb +++ b/app/models/post_flag.rb @@ -45,7 +45,7 @@ class PostFlag < ActiveRecord::Base end def search(params) - q = where("true") + q = order("post_flags.id desc") return q if params.blank? if params[:reason_matches].present? diff --git a/app/views/post_appeals/index.html.erb b/app/views/post_appeals/index.html.erb index 8f9b0d59e..aa5e0ddbb 100644 --- a/app/views/post_appeals/index.html.erb +++ b/app/views/post_appeals/index.html.erb @@ -7,20 +7,44 @@ Post - Creator Reason - Date + Appeals Resolved? + Uploaded + Appealed + Approver <% @post_appeals.each do |post_appeal| %> <%= PostPresenter.preview(post_appeal.post, :tags => "status:any") %> - <%= link_to_user post_appeal.creator %> <%= format_text post_appeal.reason, :ragel => true %> - <%= compact_time post_appeal.updated_at %> - <%= post_appeal.resolved? %> + + <%= link_to post_appeal.post.appeals.size, post_appeals_path(search: { post_id: post_appeal.post_id }) %> + + + <%= link_to post_appeal.is_resolved.to_s, post_appeals_path(search: params[:search].merge(is_resolved: post_appeal.is_resolved)) %> + + + <%= compact_time post_appeal.post.created_at %> +
by <%= link_to_user post_appeal.post.uploader %> + <%= link_to "»", post_appeals_path(search: params[:search].merge(post_tags_match: "#{params[:search][:post_tags_match]} user:#{post_appeal.post.uploader.name}".strip)) %> + + + <%= compact_time post_appeal.created_at %> +
by <%= link_to_user post_appeal.creator %> + <%= link_to "»", post_appeals_path(search: params[:search].merge(creator_name: post_appeal.creator.name)) %> + + + <% if post_appeal.post.approver %> + <%= link_to_user post_appeal.post.approver %> + <%= link_to "»", post_appeals_path(search: params[:search].merge(post_tags_match: "#{params[:search][:post_tags_match]} approver:#{post_appeal.post.approver.name}".strip)) %> + <% else %> + none + <%= link_to "»", post_appeals_path(search: params[:search].merge(post_tags_match: "#{params[:search][:post_tags_match]} approver:none".strip)) %> + <% end %> + <% end %> diff --git a/app/views/post_flags/index.html.erb b/app/views/post_flags/index.html.erb index 5e4e59829..4259117e2 100644 --- a/app/views/post_flags/index.html.erb +++ b/app/views/post_flags/index.html.erb @@ -6,25 +6,53 @@ - - <% if CurrentUser.user.is_moderator? %> - - <% end %> + - + + + + + + <% @post_flags.each do |post_flag| %> - <% if CurrentUser.user.is_moderator? %> - - <% end %> - - + + + + + + + <% end %>
CreatorPost ReasonDateFlagsCategoryResolved?UploadedFlaggedApprover
<%= PostPresenter.preview(post_flag.post, :tags => "status:any") %> - <%= link_to_user post_flag.creator %> - <%= format_text post_flag.reason, :ragel => true %><%= compact_time post_flag.updated_at %> + <%= format_text post_flag.reason, :ragel => true %> + + <%= link_to post_flag.post.flags.size, post_flags_path(search: { post_id: post_flag.post_id }) %> + + <%= link_to post_flag.category.to_s, post_flags_path(search: params[:search].merge(category: post_flag.category)) %> + + <%= link_to post_flag.is_resolved?.to_s, post_flags_path(search: params[:search].merge(is_resolved: post_flag.is_resolved?)) %> + + <%= compact_time post_flag.post.created_at %> +
by <%= link_to_user post_flag.post.uploader %> + <%= link_to "»", post_flags_path(search: params[:search].merge(post_tags_match: "#{params[:search][:post_tags_match]} user:#{post_flag.post.uploader.name}".strip)) %> +
+ <%= compact_time post_flag.created_at %> + <% if CurrentUser.user.is_moderator? %> +
by <%= link_to_user post_flag.creator %> + <%= link_to "»", post_flags_path(search: params[:search].merge(creator_name: post_flag.creator.name)) %> + <% end %> +
+ <% if post_flag.post.approver %> + <%= link_to_user post_flag.post.approver %> + <%= link_to "»", post_flags_path(search: params[:search].merge(post_tags_match: "#{params[:search][:post_tags_match]} approver:#{post_flag.post.approver.name}".strip)) %> + <% else %> + none + <%= link_to "»", post_flags_path(search: params[:search].merge(post_tags_match: "#{params[:search][:post_tags_match]} approver:none".strip)) %> + <% end %> +