[BURs] Remove another unused import parameter

Was only possible to set to false on the previously removed import page.
This commit is contained in:
Earlopain 2022-12-26 20:36:53 +01:00
parent e3b02a7f96
commit 76f54e32b9
No known key found for this signature in database
GPG Key ID: 6CFB948E15246897
3 changed files with 6 additions and 11 deletions

View File

@ -1,11 +1,10 @@
class BulkUpdateRequestImporter
class Error < RuntimeError; end
attr_accessor :text, :forum_id, :rename_aliased_pages, :creator_id, :creator_ip_addr
attr_accessor :text, :forum_id, :creator_id, :creator_ip_addr
def initialize(text, forum_id, rename_aliased_pages = "0", creator = nil, ip_addr = nil)
def initialize(text, forum_id, creator = nil, ip_addr = nil)
@forum_id = forum_id
@text = text
@rename_aliased_pages = rename_aliased_pages
@creator_id = creator
@creator_ip_addr = ip_addr
end
@ -20,10 +19,6 @@ class BulkUpdateRequestImporter
validate_annotate(tokens, user)
end
def rename_aliased_pages?
@rename_aliased_pages == "1"
end
def self.tokenize(text)
text.split(/\r\n|\r|\n/).reject(&:blank?).map do |line|
line = line.gsub(/[[:space:]]+/, " ").strip
@ -193,7 +188,7 @@ class BulkUpdateRequestImporter
end
end
tag_alias.rename_artist if rename_aliased_pages?
tag_alias.rename_artist
raise Error, "Error: Alias would modify other aliases or implications through transitive relationships. (create alias #{tag_alias.antecedent_name} -> #{tag_alias.consequent_name})" if tag_alias.has_transitives
tag_alias.approve!(approver: approver, update_topic: false, deny_transitives: true)
end

View File

@ -109,7 +109,7 @@ class BulkUpdateRequest < ApplicationRecord
def approve!(approver)
transaction do
CurrentUser.scoped(approver) do
BulkUpdateRequestImporter.new(script, forum_topic_id, "1", user_id, user_ip_addr).process!
BulkUpdateRequestImporter.new(script, forum_topic_id, user_id, user_ip_addr).process!
update(status: "approved", approver: CurrentUser.user)
forum_updater.update("The #{bulk_update_request_link} (forum ##{forum_post&.id}) has been approved by @#{approver.name}.", "APPROVED")
end
@ -166,7 +166,7 @@ class BulkUpdateRequest < ApplicationRecord
end
def validate_script
errors, new_script = BulkUpdateRequestImporter.new(script, forum_topic_id, "1").validate!(CurrentUser.user)
errors, new_script = BulkUpdateRequestImporter.new(script, forum_topic_id).validate!(CurrentUser.user)
if errors.size > 0
errors.each { |err| self.errors.add(:base, err) }
end

View File

@ -86,7 +86,7 @@ class BulkUpdateRequestImporterTest < ActiveSupport::TestCase
tag1 = create(:tag, name: "aaa", category: 1)
tag2 = create(:tag, name: "bbb")
artist = create(:artist, name: "aaa", notes: "testing")
@importer = BulkUpdateRequestImporter.new("create alias aaa -> bbb", "", "1")
@importer = BulkUpdateRequestImporter.new("create alias aaa -> bbb", "")
@importer.process!
artist.reload
assert_equal("bbb", artist.name)