Working on issue #368 - Fixes for issues arised while using the import via the frontend.

This commit is contained in:
Thorsten Eckel 2016-11-28 11:44:56 +01:00
parent 42c1957bff
commit 617491b8e3
3 changed files with 11 additions and 7 deletions

View file

@ -49,11 +49,15 @@ module Import
true true
end end
def connection_test
Import::OTRS::Requester.connection_test
end
private private
def checks def checks
check_import_mode check_import_mode
Import::OTRS::Requester.connection_test connection_test
end end
def prerequisites def prerequisites
@ -63,9 +67,9 @@ module Import
Store::Object.create_if_not_exists(name: 'Ticket::Article') Store::Object.create_if_not_exists(name: 'Ticket::Article')
end end
def import(remote_object) def import(remote_object, args = {})
log "loading #{remote_object}..." log "loading #{remote_object}..."
import_action(remote_object) import_action(remote_object, args)
end end
def threaded_import(remote_object, args = {}) def threaded_import(remote_object, args = {})

View file

@ -29,7 +29,7 @@ module Import
end end
def ticket_diff def ticket_diff
import_regular('Ticket', diff: true) import('Ticket', diff: true)
end end
end end
end end

View file

@ -38,7 +38,7 @@ module Import
end end
def base_done def base_done
Group.count + ::Ticket::State.count + ::Ticket::Priority.count ::Group.count + ::Ticket::State.count + ::Ticket::Priority.count
end end
def base_total def base_total
@ -46,7 +46,7 @@ module Import
end end
def user_done def user_done
User.count ::User.count
end end
def user_total def user_total
@ -54,7 +54,7 @@ module Import
end end
def ticket_done def ticket_done
Ticket.count ::Ticket.count
end end
def ticket_total def ticket_total