Disapprovals
- <%= search_form_for(moderator_post_disapprovals_path) do |f| %>
+ <%= search_form_for(post_disapprovals_path) do |f| %>
<%= f.input :user_name, label: "Creator", input_html: { value: params[:search][:user_name] } %>
<%= f.input :post_id, label: "Post ID", input_html: { value: params[:search][:post_id] } %>
<%= f.input :post_tags_match, label: "Tags", input_html: { value: params[:search][:post_tags_match], data: { autocomplete: "tag-query" } } %>
@@ -16,7 +16,7 @@
<%= table_for @post_disapprovals, {class: "striped autofit", width: "100%"} do |t| %>
<% t.column "Post" do |post_disapproval| %>
<%= link_to "post ##{post_disapproval.post_id}", post_path(post_disapproval.post_id) %>
- <%= link_to "»", moderator_post_disapprovals_path(search: params[:search].merge(post_id: post_disapproval.post_id)) %>
+ <%= link_to "»", post_disapprovals_path(search: params[:search].merge(post_id: post_disapproval.post_id)) %>
<% end %>
<% t.column "Message", td: {class: "col-expand"} do |post_disapproval| %>
@@ -24,11 +24,11 @@
<% end %>
<% t.column "Reason" do |post_disapproval| %>
- <%= link_to post_disapproval.reason.humanize, moderator_post_disapprovals_path(search: params[:search].merge(reason: post_disapproval.reason)) %>
+ <%= link_to post_disapproval.reason.humanize, post_disapprovals_path(search: params[:search].merge(reason: post_disapproval.reason)) %>
<% end %>
<% t.column "Created" do |post_disapproval| %>
<%= link_to_user post_disapproval.user %>
- <%= link_to "»", moderator_post_disapprovals_path(search: params[:search].merge(creator_name: post_disapproval.user&.name)) %>
+ <%= link_to "»", post_disapprovals_path(search: params[:search].merge(creator_name: post_disapproval.user&.name)) %>
<%= compact_time(post_disapproval.updated_at) %>
diff --git a/app/views/posts/partials/show/_options.html.erb b/app/views/posts/partials/show/_options.html.erb
index 0c38411f8..ad0150c75 100644
--- a/app/views/posts/partials/show/_options.html.erb
+++ b/app/views/posts/partials/show/_options.html.erb
@@ -52,7 +52,7 @@
<% if post.is_approvable? && !post.is_deleted? %>
<%= link_to "Approve", moderator_post_approval_path(post_id: post.id), remote: true, method: :post, id: "approve", "data-shortcut": "shift+o", "data-confirm": "Are you sure you want to approve this post?" %>
-
<%= link_to "Hide from queue", moderator_post_disapprovals_path(post_disapproval: { post_id: post.id, reason: "disinterest" }), remote: true, method: :post, id: "disapprove" %>
+
<%= link_to "Hide from queue", post_disapprovals_path(post_disapproval: { post_id: post.id, reason: "disinterest" }), remote: true, method: :post, id: "disapprove" %>
<% end %>
<% if post.is_banned? %>
diff --git a/app/views/static/site_map.html.erb b/app/views/static/site_map.html.erb
index cb49809d7..1df1d9ebb 100644
--- a/app/views/static/site_map.html.erb
+++ b/app/views/static/site_map.html.erb
@@ -24,7 +24,7 @@
<%= link_to("Changes", post_versions_path) %>
<%= link_to("Approvals", post_approvals_path) %>
<% if CurrentUser.is_approver? %>
-
<%= link_to("Disapprovals", moderator_post_disapprovals_path) %>
+
<%= link_to("Disapprovals", post_disapprovals_path) %>
<% end %>
<%= link_to("Appeals", post_appeals_path) %>
<%= link_to("Flags", post_flags_path) %>
diff --git a/config/routes.rb b/config/routes.rb
index e063fd3cc..cd2c37479 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -20,7 +20,6 @@ Rails.application.routes.draw do
end
end
resource :approval, :only => [:create]
- resources :disapprovals, :only => [:create, :index]
resources :posts, :only => [:delete, :undelete, :expunge, :confirm_delete] do
member do
get :confirm_delete
@@ -206,6 +205,7 @@ Rails.application.routes.draw do
resources :post_appeals
resources :post_flags
resources :post_approvals, only: [:index]
+ resources :post_disapprovals, only: [:create, :index]
resources :post_versions, :only => [:index, :search] do
member do
put :undo
diff --git a/test/functional/moderator/post/disapprovals_controller_test.rb b/test/functional/moderator/post/disapprovals_controller_test.rb
deleted file mode 100644
index a3395f5f3..000000000
--- a/test/functional/moderator/post/disapprovals_controller_test.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-require 'test_helper'
-
-module Moderator
- module Post
- class DisapprovalsControllerTest < ActionDispatch::IntegrationTest
- context "The moderator post disapprovals controller" do
- setup do
- @admin = create(:admin_user)
- as_user do
- @post = create(:post, :is_pending => true)
- end
-
- CurrentUser.user = @admin
- end
-
- context "create action" do
- should "render" do
- assert_difference("PostDisapproval.count", 1) do
- post_auth moderator_post_disapprovals_path, @admin, params: { post_disapproval: { post_id: @post.id, reason: "breaks_rules" }, format: "js" }
- end
- assert_response :success
- end
-
- context "for json" do
- should "render" do
- assert_difference("PostDisapproval.count", 1) do
- post_auth moderator_post_disapprovals_path, @admin, params: { post_disapproval: { post_id: @post.id, reason: "breaks_rules" }, format: "json" }
- end
- assert_response :success
- end
- end
- end
-
- context "index action" do
- should "render" do
- disapproval = FactoryBot.create(:post_disapproval, post: @post)
- get_auth moderator_post_disapprovals_path, @admin
-
- assert_response :success
- end
- end
- end
- end
- end
-end
diff --git a/test/functional/post_disapprovals_controller_test.rb b/test/functional/post_disapprovals_controller_test.rb
new file mode 100644
index 000000000..9789061b1
--- /dev/null
+++ b/test/functional/post_disapprovals_controller_test.rb
@@ -0,0 +1,41 @@
+require 'test_helper'
+
+class PostDisapprovalsControllerTest < ActionDispatch::IntegrationTest
+ context "The post disapprovals controller" do
+ setup do
+ @admin = create(:admin_user)
+ as_user do
+ @post = create(:post, :is_pending => true)
+ end
+
+ CurrentUser.user = @admin
+ end
+
+ context "create action" do
+ should "render" do
+ assert_difference("PostDisapproval.count", 1) do
+ post_auth moderator_post_disapprovals_path, @admin, params: { post_disapproval: { post_id: @post.id, reason: "breaks_rules" }, format: "js" }
+ end
+ assert_response :success
+ end
+
+ context "for json" do
+ should "render" do
+ assert_difference("PostDisapproval.count", 1) do
+ post_auth moderator_post_disapprovals_path, @admin, params: { post_disapproval: { post_id: @post.id, reason: "breaks_rules" }, format: "json" }
+ end
+ assert_response :success
+ end
+ end
+ end
+
+ context "index action" do
+ should "render" do
+ disapproval = FactoryBot.create(:post_disapproval, post: @post)
+ get_auth moderator_post_disapprovals_path, @admin
+
+ assert_response :success
+ end
+ end
+ end
+end