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

modqueue: move url from /moderator/post/queue to /modqueue.

Browse Source
This commit is contained in:
evazion
2020-02-29 14:00:09 -06:00
parent 72210c0226
commit 475d6ae7cf
15 changed files with 44 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/controllers/moderator/post/queues_controller.rb
View File

@@ -1,14 +0,0 @@
module Moderator
module Post
class QueuesController < ApplicationController
respond_to :html, :json
before_action :approver_only
skip_before_action :api_check
def show
@posts = ::Post.includes(:appeals, :disapprovals, :uploader, flags: [:creator]).reorder(id: :asc).pending_or_flagged.available_for_moderation(search_params[:hidden]).tag_match(search_params[:tags]).paginated_search(params, count_pages: true)
respond_with(@posts)
end
end
end
end

9
app/controllers/modqueue_controller.rb Normal file
View File

@@ -0,0 +1,9 @@
class ModqueueController < ApplicationController
respond_to :html, :json, :xml
before_action :approver_only
def index
@posts = Post.includes(:appeals, :disapprovals, :uploader, flags: [:creator]).reorder(id: :asc).pending_or_flagged.available_for_moderation(search_params[:hidden]).tag_match(search_params[:tags]).paginated_search(params, count_pages: true)
respond_with(@posts)
end
end

2
app/javascript/src/styles/specific/mod_queue.scss.erb
View File

@@ -1,6 +1,6 @@
@import "../base/000_vars.scss";
div#c-moderator-post-queues {
div#c-modqueue {
div.post {
padding: 1em;
margin-bottom: 4em;

0
app/views/moderator/post/queues/_desc.html.erb → app/views/modqueue/_desc.html.erb
View File

2
app/views/moderator/post/queues/_post.html.erb → app/views/modqueue/_post.html.erb
View File

@@ -6,7 +6,7 @@
<section class="column column-expand">
<ul>
<li>
<%= render "moderator/post/queues/quick_mod", post: post %>
<%= render "modqueue/quick_mod", post: post %>
</li>
<li><strong>Rating</strong>: <%= post.pretty_rating %></li>
<li><strong>Score</strong>: <%= post.score %></li>

0
app/views/moderator/post/queues/_quick_mod.html.erb → app/views/modqueue/_quick_mod.html.erb
View File

10
app/views/moderator/post/queues/show.html.erb → app/views/modqueue/index.html.erb
View File

@@ -1,11 +1,11 @@
<% page_title "Mod Queue" %>
<div id="c-moderator-post-queues">
<div id="a-show">
<div id="c-modqueue">
<div id="a-index">
<div>
<h1>Moderation Queue</h1>
<%= search_form_for(moderator_post_queue_path) do |f| %>
<%= search_form_for(modqueue_index_path) do |f| %>
<%= f.input :tags, input_html: { value: params.dig(:search, :tags), "data-autocomplete": "tag-query" } %>
<%= f.submit "Search" %>
<% end %>
@@ -17,9 +17,9 @@
<p>
<% if params.dig(:search, :hidden) %>
<%= link_to "View pending posts", moderator_post_queue_path(search: { tags: params.dig(:search, :tags), hidden: nil }) %>.
<%= link_to "View pending posts", modqueue_index_path(search: { tags: params.dig(:search, :tags), hidden: nil }) %>.
<% else %>
<%= link_to "View hidden posts", moderator_post_queue_path(search: { tags: params.dig(:search, :tags), hidden: true, }) %>.
<%= link_to "View hidden posts", modqueue_index_path(search: { tags: params.dig(:search, :tags), hidden: true, }) %>.
<% end %>
</p>
</div>

4
app/views/post_approvals/create.js.erb
View File

@@ -3,8 +3,8 @@
<% else %>
if ($("#c-posts #a-show").length) {
location.reload();
} else if ($("#c-moderator-post-queues").length) {
$("#c-moderator-post-queues #post-<%= @approval.post.id %>").hide();
} else if ($("#c-modqueue").length) {
$("#c-modqueue #post-<%= @approval.post.id %>").hide();
Danbooru.notice("Post was approved");
}
<% end %>

4
app/views/post_disapprovals/create.js.erb
View File

@@ -3,8 +3,8 @@
<% else %>
if ($("#c-posts #a-show").length) {
location.reload();
} else if ($("#c-moderator-post-queues").length) {
$("#c-moderator-post-queues #post-<%= @post_disapproval.post.id %>").hide();
} else if ($("#c-modqueue").length) {
$("#c-modqueue #post-<%= @post_disapproval.post.id %>").hide();
Danbooru.notice("Post was hidden");
}
<% end %>

2
app/views/posts/partials/common/_secondary_links.html.erb
View File

@@ -12,7 +12,7 @@
<% end %>
<%= subnav_link_to "Changes", post_versions_path %>
<% if CurrentUser.can_approve_posts? %>
<%= subnav_link_to "Moderate", moderator_post_queue_path %>
<%= subnav_link_to "Modqueue", modqueue_index_path %>
<% end %>
<%= subnav_link_to "Help", wiki_page_path("help:posts") %>
<% end %>

2
app/views/posts/partials/show/_notices.html.erb
View File

@@ -42,7 +42,7 @@
<%= render "post_disapprovals/counts", :disapprovals => post.disapprovals, :post => post %>
<% if CurrentUser.can_approve_posts? && !post.disapproved_by?(CurrentUser.user) %>
<%= render "moderator/post/queues/quick_mod", post: post %>
<%= render "modqueue/quick_mod", post: post %>
<%= render "post_disapprovals/detailed_rejection_dialog" %>
<% end %>
</div>

2
app/views/static/site_map.html.erb
View File

@@ -14,7 +14,7 @@
<li><%= link_to("Most Viewed", viewed_explore_posts_path) %></li>
<li><%= link_to("Votes", post_votes_path) %></li>
<% if CurrentUser.can_approve_posts? %>
<li><%= link_to("Moderate", moderator_post_queue_path) %></li>
<li><%= link_to("Modqueue", modqueue_index_path) %></li>
<% end %>
</ul>
<ul>

2
config/routes.rb
View File

@@ -11,7 +11,6 @@ Rails.application.routes.draw do
end
end
namespace :post do
resource :queue, only: [:show]
resources :posts, :only => [:delete, :expunge, :confirm_delete] do
member do
get :confirm_delete
@@ -142,6 +141,7 @@ Rails.application.routes.draw do
end
resources :mod_actions
resources :moderation_reports, only: [:new, :create, :index, :show]
resources :modqueue, only: [:index]
resources :news_updates
resources :notes do
collection do

24
test/functional/moderator/post/queues_controller_test.rb
View File

@@ -1,24 +0,0 @@
require 'test_helper'
module Moderator
module Post
class QueuesControllerTest < ActionDispatch::IntegrationTest
context "The moderator post queues controller" do
setup do
@admin = create(:admin_user)
@user = create(:user)
as_user do
@post = create(:post, :is_pending => true)
end
end
context "show action" do
should "render" do
get_auth moderator_post_queue_path, @admin
assert_response :success
end
end
end
end
end
end

20
test/functional/modqueue_controller_text.rb Normal file
View File

@@ -0,0 +1,20 @@
require 'test_helper'
class ModqueueControllerTest < ActionDispatch::IntegrationTest
context "The modqueue controller" do
setup do
@admin = create(:admin_user)
@user = create(:user)
as_user do
@post = create(:post, :is_pending => true)
end
end
context "index action" do
should "render" do
get_auth modqueue_index_path, @admin
assert_response :success
end
end
end
end