forked from e621ng/e621ng
[BURs] Remove unused first parameter for import
This commit is contained in:
parent
03d575cbdb
commit
f08a094ea2
@ -1,9 +1,8 @@
|
||||
class AliasAndImplicationImporter
|
||||
class Error < RuntimeError; end
|
||||
attr_accessor :bur, :text, :forum_id, :rename_aliased_pages, :creator_id, :creator_ip_addr
|
||||
attr_accessor :text, :forum_id, :rename_aliased_pages, :creator_id, :creator_ip_addr
|
||||
|
||||
def initialize(bur, text, forum_id, rename_aliased_pages = "0", creator = nil, ip_addr = nil)
|
||||
@bur = bur
|
||||
def initialize(text, forum_id, rename_aliased_pages = "0", creator = nil, ip_addr = nil)
|
||||
@forum_id = forum_id
|
||||
@text = text
|
||||
@rename_aliased_pages = rename_aliased_pages
|
||||
|
@ -109,7 +109,7 @@ class BulkUpdateRequest < ApplicationRecord
|
||||
def approve!(approver)
|
||||
transaction do
|
||||
CurrentUser.scoped(approver) do
|
||||
AliasAndImplicationImporter.new(self, script, forum_topic_id, "1", user_id, user_ip_addr).process!
|
||||
AliasAndImplicationImporter.new(script, forum_topic_id, "1", 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 = AliasAndImplicationImporter.new(self, script, forum_topic_id, "1").validate!(CurrentUser.user)
|
||||
errors, new_script = AliasAndImplicationImporter.new(script, forum_topic_id, "1").validate!(CurrentUser.user)
|
||||
if errors.size > 0
|
||||
errors.each { |err| self.errors.add(:base, err) }
|
||||
end
|
||||
@ -234,6 +234,6 @@ class BulkUpdateRequest < ApplicationRecord
|
||||
end
|
||||
|
||||
def estimate_update_count
|
||||
AliasAndImplicationImporter.new(self, script, nil).estimate_update_count
|
||||
AliasAndImplicationImporter.new(script, nil).estimate_update_count
|
||||
end
|
||||
end
|
||||
|
@ -10,7 +10,7 @@ class AliasAndImplicationImporterTest < ActiveSupport::TestCase
|
||||
setup do
|
||||
@tag = Tag.find_or_create_by_name("hello")
|
||||
@list = "category hello -> artist\n"
|
||||
@importer = AliasAndImplicationImporter.new(nil, @list, nil)
|
||||
@importer = AliasAndImplicationImporter.new(@list, nil)
|
||||
end
|
||||
|
||||
should "work" do
|
||||
@ -36,7 +36,7 @@ class AliasAndImplicationImporterTest < ActiveSupport::TestCase
|
||||
"mass update eee -> 444\n"
|
||||
end
|
||||
|
||||
subject { AliasAndImplicationImporter.new(nil, @script, nil) }
|
||||
subject { AliasAndImplicationImporter.new(@script, nil) }
|
||||
|
||||
should "return the correct count" do
|
||||
assert_equal(3, subject.estimate_update_count)
|
||||
@ -46,7 +46,7 @@ class AliasAndImplicationImporterTest < ActiveSupport::TestCase
|
||||
context "given a valid list" do
|
||||
setup do
|
||||
@list = "create alias abc -> def\ncreate implication aaa -> bbb\n"
|
||||
@importer = AliasAndImplicationImporter.new(nil, @list, nil)
|
||||
@importer = AliasAndImplicationImporter.new(@list, nil)
|
||||
end
|
||||
|
||||
should "process it" do
|
||||
@ -59,7 +59,7 @@ class AliasAndImplicationImporterTest < ActiveSupport::TestCase
|
||||
context "given a list with an invalid command" do
|
||||
setup do
|
||||
@list = "zzzz abc -> def\n"
|
||||
@importer = AliasAndImplicationImporter.new(nil, @list, nil)
|
||||
@importer = AliasAndImplicationImporter.new(@list, nil)
|
||||
end
|
||||
|
||||
should "throw an exception" do
|
||||
@ -72,7 +72,7 @@ class AliasAndImplicationImporterTest < ActiveSupport::TestCase
|
||||
context "given a list with a logic error" do
|
||||
setup do
|
||||
@list = "remove alias zzz -> yyy\n"
|
||||
@importer = AliasAndImplicationImporter.new(nil, @list, nil)
|
||||
@importer = AliasAndImplicationImporter.new(@list, nil)
|
||||
end
|
||||
|
||||
should "throw an exception" do
|
||||
@ -86,7 +86,7 @@ class AliasAndImplicationImporterTest < ActiveSupport::TestCase
|
||||
tag1 = create(:tag, name: "aaa", category: 1)
|
||||
tag2 = create(:tag, name: "bbb")
|
||||
artist = create(:artist, name: "aaa", notes: "testing")
|
||||
@importer = AliasAndImplicationImporter.new(nil, "create alias aaa -> bbb", "", "1")
|
||||
@importer = AliasAndImplicationImporter.new("create alias aaa -> bbb", "", "1")
|
||||
@importer.process!
|
||||
artist.reload
|
||||
assert_equal("bbb", artist.name)
|
||||
@ -101,7 +101,7 @@ class AliasAndImplicationImporterTest < ActiveSupport::TestCase
|
||||
remove alias a -> b
|
||||
remove implication c -> d
|
||||
}
|
||||
@importer = AliasAndImplicationImporter.new(nil, @script, nil)
|
||||
@importer = AliasAndImplicationImporter.new(@script, nil)
|
||||
end
|
||||
|
||||
# FIXME: Aliases/Implications are hard-deleted currently
|
||||
|
Loading…
Reference in New Issue
Block a user