+
New Bulk Update Request
<%= render "form" %>
diff --git a/app/views/forum_topics/_secondary_links.html.erb b/app/views/forum_topics/_secondary_links.html.erb
index b466ca216..0a995fd62 100644
--- a/app/views/forum_topics/_secondary_links.html.erb
+++ b/app/views/forum_topics/_secondary_links.html.erb
@@ -4,10 +4,13 @@
<% if CurrentUser.is_member? %>
<%= subnav_link_to "New", new_forum_topic_path %>
- <%= subnav_link_to "Request alias", new_tag_alias_request_path %>
- <%= subnav_link_to "Request implication", new_tag_implication_request_path %>
- <%= subnav_link_to "Request BUR", new_bulk_update_request_path %>
<%= subnav_link_to "Mark all as read", mark_all_as_read_forum_topics_path, :method => :post, :"data-shortcut" => "shift+r" %>
+
+ <% if @forum_topic %>
+ <%= subnav_link_to "Request alias/implication", new_bulk_update_request_path(bulk_update_request: { forum_topic_id: @forum_topic.id }) %>
+ <% else %>
+ <%= subnav_link_to "Request alias/implication", new_bulk_update_request_path %>
+ <% end %>
<% end %>
<%= subnav_link_to "Search", search_forum_posts_path %>
diff --git a/app/views/tag_aliases/_secondary_links.html.erb b/app/views/tag_aliases/_secondary_links.html.erb
index 43e5280a9..c6f613b49 100644
--- a/app/views/tag_aliases/_secondary_links.html.erb
+++ b/app/views/tag_aliases/_secondary_links.html.erb
@@ -1,7 +1,6 @@
<% content_for(:secondary_links) do %>
<%= subnav_link_to "Listing", tag_aliases_path %>
<%= subnav_link_to "MetaSearch", meta_searches_tags_path %>
- <%= subnav_link_to "Request alias", new_tag_alias_request_path %>
- <%= subnav_link_to "Request bulk update", new_bulk_update_request_path %>
+ <%= subnav_link_to "Request alias", new_bulk_update_request_path %>
<%= subnav_link_to "Help", wiki_pages_path(:title => "help:tag_aliases") %>
<% end %>
diff --git a/app/views/tag_implications/_secondary_links.html.erb b/app/views/tag_implications/_secondary_links.html.erb
index 4b5cb3f60..889533a69 100644
--- a/app/views/tag_implications/_secondary_links.html.erb
+++ b/app/views/tag_implications/_secondary_links.html.erb
@@ -1,7 +1,6 @@
<% content_for(:secondary_links) do %>
<%= subnav_link_to "Listing", tag_implications_path %>
<%= subnav_link_to "MetaSearch", meta_searches_tags_path %>
- <%= subnav_link_to "Request implication", new_tag_implication_request_path %>
- <%= subnav_link_to "Request bulk update", new_bulk_update_request_path %>
+ <%= subnav_link_to "Request implication", new_bulk_update_request_path %>
<%= subnav_link_to "Help", wiki_pages_path(:title => "help:tag_implications") %>
<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 67c7f21a7..ebfdee76f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -267,13 +267,11 @@ Rails.application.routes.draw do
post :approve
end
end
- resource :tag_alias_request, :only => [:new, :create]
resources :tag_implications do
member do
post :approve
end
end
- resource :tag_implication_request, :only => [:new, :create]
resources :uploads do
collection do
post :preprocess
diff --git a/test/functional/tag_alias_requests_controller_test.rb b/test/functional/tag_alias_requests_controller_test.rb
deleted file mode 100644
index d67c6965e..000000000
--- a/test/functional/tag_alias_requests_controller_test.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'test_helper'
-
-class TagAliasRequestsControllerTest < ActionDispatch::IntegrationTest
- context "The tag alias request controller" do
- setup do
- @user = create(:user)
- end
-
- context "new action" do
- should "render" do
- get_auth new_tag_alias_request_path, @user
- assert_response :success
- end
- end
-
- context "create action" do
- should "render" do
- assert_difference("ForumTopic.count", 1) do
- post_auth tag_alias_request_path, @user, params: {:tag_alias_request => {:antecedent_name => "aaa", :consequent_name => "bbb", :reason => "ccc", :skip_secondary_validations => true}}
- end
- assert_redirected_to(forum_topic_path(ForumTopic.last))
- end
- end
- end
-end
diff --git a/test/functional/tag_implication_requests_controller_test.rb b/test/functional/tag_implication_requests_controller_test.rb
deleted file mode 100644
index a48b7a3bc..000000000
--- a/test/functional/tag_implication_requests_controller_test.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'test_helper'
-
-class TagImplicationRequestsControllerTest < ActionDispatch::IntegrationTest
- context "The tag implication request controller" do
- setup do
- travel_to(1.month.ago) do
- @user = create(:user)
- end
- end
-
- context "new action" do
- should "render" do
- get_auth new_tag_implication_request_path, @user
- assert_response :success
- end
- end
-
- context "create action" do
- should "create forum post" do
- assert_difference("ForumTopic.count", 1) do
- post_auth tag_implication_request_path, @user, params: {:tag_implication_request => {:antecedent_name => "aaa", :consequent_name => "bbb", :reason => "ccc", :skip_secondary_validations => true}}
- end
- assert_redirected_to(forum_topic_path(ForumTopic.last))
- end
-
- should "create a pending implication" do
- params = {
- :tag_implication_request => {
- :antecedent_name => "foo",
- :consequent_name => "bar",
- :reason => "blah blah",
- :skip_secondary_validations => true
- }
- }
-
- assert_difference("ForumTopic.count") do
- post_auth tag_implication_request_path, @user, params: params
- end
- assert_redirected_to(forum_topic_path(ForumTopic.last))
- end
- end
- end
-end
diff --git a/test/unit/tag_alias_request_test.rb b/test/unit/tag_alias_request_test.rb
deleted file mode 100644
index aaea0e91b..000000000
--- a/test/unit/tag_alias_request_test.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require 'test_helper'
-
-class TagAliasRequestTest < ActiveSupport::TestCase
- context "A tag alias request" do
- setup do
- @user = FactoryBot.create(:user)
- CurrentUser.user = @user
- CurrentUser.ip_addr = "127.0.0.1"
- end
-
- teardown do
- CurrentUser.user = nil
- CurrentUser.ip_addr = nil
- end
-
- should "handle invalid attributes" do
- tar = TagAliasRequest.new(:antecedent_name => "", :consequent_name => "", :reason => "reason", :skip_secondary_validations => true)
- tar.create
- assert(tar.invalid?)
- end
-
- should "handle secondary validations" do
- tar = TagAliasRequest.new(:antecedent_name => "aaa", :consequent_name => "bbb", :reason => "reason", :skip_secondary_validations => false)
- tar.create
- assert(tar.invalid?)
- end
-
- should "create a tag alias" do
- assert_difference("TagAlias.count", 1) do
- tar = TagAliasRequest.new(:antecedent_name => "aaa", :consequent_name => "bbb", :reason => "reason", :skip_secondary_validations => true)
- tar.create
- end
- assert_equal("pending", TagAlias.last.status)
- end
-
- should "create a forum topic" do
- assert_difference("ForumTopic.count", 1) do
- tar = TagAliasRequest.new(:antecedent_name => "aaa", :consequent_name => "bbb", :reason => "reason", :skip_secondary_validations => true)
- tar.create
- end
- end
-
- should "create a forum post" do
- assert_difference("ForumPost.count", 1) do
- tar = TagAliasRequest.new(:antecedent_name => "aaa", :consequent_name => "bbb", :reason => "reason", :skip_secondary_validations => true)
- tar.create
- end
- end
-
- should "save the forum post id" do
- tar = TagAliasRequest.new(:antecedent_name => "aaa", :consequent_name => "bbb", :reason => "reason", :skip_secondary_validations => true)
- tar.create
- assert_equal(tar.forum_topic.posts.first.id, tar.tag_alias.forum_post.id)
- end
- end
-end
diff --git a/test/unit/tag_alias_test.rb b/test/unit/tag_alias_test.rb
index bd8306d50..fb6b161fe 100644
--- a/test/unit/tag_alias_test.rb
+++ b/test/unit/tag_alias_test.rb
@@ -204,7 +204,7 @@ class TagAliasTest < ActiveSupport::TestCase
setup do
@admin = FactoryBot.create(:admin_user)
CurrentUser.scoped(@admin) do
- @topic = FactoryBot.create(:forum_topic, :title => TagAliasRequest.topic_title("aaa", "bbb"))
+ @topic = FactoryBot.create(:forum_topic, :title => "Tag alias: aaa -> bbb")
@post = FactoryBot.create(:forum_post, :topic_id => @topic.id, :body => TagAliasRequest.command_string("aaa", "bbb"))
@alias = FactoryBot.create(:tag_alias, :antecedent_name => "aaa", :consequent_name => "bbb", :forum_topic => @topic, :forum_post => @post, :status => "pending")
end
diff --git a/test/unit/tag_implication_request_test.rb b/test/unit/tag_implication_request_test.rb
deleted file mode 100644
index a06a0880a..000000000
--- a/test/unit/tag_implication_request_test.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require 'test_helper'
-
-class TagImplicationRequestTest < ActiveSupport::TestCase
- context "A tag implication request" do
- setup do
- @user = FactoryBot.create(:user)
- CurrentUser.user = @user
- CurrentUser.ip_addr = "127.0.0.1"
- end
-
- teardown do
- CurrentUser.user = nil
- CurrentUser.ip_addr = nil
- end
-
- should "handle invalid attributes" do
- tir = TagImplicationRequest.new(:antecedent_name => "", :consequent_name => "", :reason => "reason", :skip_secondary_validations => true)
- tir.create
- assert(tir.invalid?)
- end
-
- should "handle secondary validations" do
- tir = TagImplicationRequest.new(:antecedent_name => "aaa", :consequent_name => "bbb", :reason => "reason", :skip_secondary_validations => false)
- tir.create
- assert(tir.invalid?)
- end
-
- should "create a tag implication" do
- assert_difference("TagImplication.count", 1) do
- tir = TagImplicationRequest.new(:antecedent_name => "aaa", :consequent_name => "bbb", :reason => "reason", :skip_secondary_validations => true)
- tir.create
- end
- assert_equal("pending", TagImplication.last.status)
- end
-
- should "create a forum topic" do
- assert_difference("ForumTopic.count", 1) do
- tir = TagImplicationRequest.new(:antecedent_name => "aaa", :consequent_name => "bbb", :reason => "reason", :skip_secondary_validations => true)
- tir.create
- end
- end
-
- should "create a forum post" do
- assert_difference("ForumPost.count", 1) do
- tir = TagImplicationRequest.new(:antecedent_name => "aaa", :consequent_name => "bbb", :reason => "reason", :skip_secondary_validations => true)
- tir.create
- end
- end
- end
-end
diff --git a/test/unit/tag_implication_test.rb b/test/unit/tag_implication_test.rb
index 1f9d813c3..4f5bdc069 100644
--- a/test/unit/tag_implication_test.rb
+++ b/test/unit/tag_implication_test.rb
@@ -264,7 +264,7 @@ class TagImplicationTest < ActiveSupport::TestCase
context "with an associated forum topic" do
setup do
@admin = FactoryBot.create(:admin_user)
- @topic = FactoryBot.create(:forum_topic, :title => TagImplicationRequest.topic_title("aaa", "bbb"))
+ @topic = FactoryBot.create(:forum_topic, :title => "Tag implication: aaa -> bbb")
@post = FactoryBot.create(:forum_post, topic_id: @topic.id, :body => TagImplicationRequest.command_string("aaa", "bbb"))
@implication = FactoryBot.create(:tag_implication, :antecedent_name => "aaa", :consequent_name => "bbb", :forum_topic => @topic, :forum_post => @post, :status => "pending")
end