diff --git a/lib/import/otrs.rb b/lib/import/otrs.rb index 81f75b780..b471eff30 100644 --- a/lib/import/otrs.rb +++ b/lib/import/otrs.rb @@ -49,11 +49,15 @@ module Import true end + def connection_test + Import::OTRS::Requester.connection_test + end + private def checks check_import_mode - Import::OTRS::Requester.connection_test + connection_test end def prerequisites @@ -63,9 +67,9 @@ module Import Store::Object.create_if_not_exists(name: 'Ticket::Article') end - def import(remote_object) + def import(remote_object, args = {}) log "loading #{remote_object}..." - import_action(remote_object) + import_action(remote_object, args) end def threaded_import(remote_object, args = {}) diff --git a/lib/import/otrs/diff.rb b/lib/import/otrs/diff.rb index 096c223f3..316457953 100644 --- a/lib/import/otrs/diff.rb +++ b/lib/import/otrs/diff.rb @@ -29,7 +29,7 @@ module Import end def ticket_diff - import_regular('Ticket', diff: true) + import('Ticket', diff: true) end end end diff --git a/lib/import/otrs/import_stats.rb b/lib/import/otrs/import_stats.rb index e07e5609b..e1c437501 100644 --- a/lib/import/otrs/import_stats.rb +++ b/lib/import/otrs/import_stats.rb @@ -38,7 +38,7 @@ module Import end def base_done - Group.count + ::Ticket::State.count + ::Ticket::Priority.count + ::Group.count + ::Ticket::State.count + ::Ticket::Priority.count end def base_total @@ -46,7 +46,7 @@ module Import end def user_done - User.count + ::User.count end def user_total @@ -54,7 +54,7 @@ module Import end def ticket_done - Ticket.count + ::Ticket.count end def ticket_total