Fixes #3879 - Freshdesk import ends up in Zammad interface without navigation.
This commit is contained in:
parent
82041f427b
commit
7adc0a12d0
4 changed files with 16 additions and 4 deletions
|
@ -165,7 +165,7 @@ class ImportFreshdesk extends App.ControllerWizardFullScreen
|
|||
@$('.js-error').addClass('hide')
|
||||
|
||||
if !_.isEmpty(data.finished_at) && _.isEmpty(data.result['error'])
|
||||
window.location.reload()
|
||||
@redirectToLogin()
|
||||
return
|
||||
|
||||
if !_.isEmpty(data.result)
|
||||
|
|
|
@ -163,7 +163,7 @@ class ImportZendesk extends App.ControllerWizardFullScreen
|
|||
@$('.js-error').addClass('hide')
|
||||
|
||||
if !_.isEmpty(data.finished_at) && _.isEmpty(data.result['error'])
|
||||
window.location.reload()
|
||||
@redirectToLogin()
|
||||
return
|
||||
|
||||
if !_.isEmpty(data.result)
|
||||
|
|
|
@ -112,7 +112,13 @@ RSpec.describe 'Import Freshdesk', type: :system, set_up: false, authenticated_a
|
|||
|
||||
Rake::Task['zammad:setup:auto_wizard'].execute
|
||||
|
||||
expect(page).to have_text('Login')
|
||||
expect(page).to have_text(Setting.get('fqdn'))
|
||||
|
||||
# Check that the login is working and also the left navigation side bar is visible.
|
||||
login(
|
||||
username: 'admin@example.com',
|
||||
password: 'test',
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -121,7 +121,13 @@ RSpec.describe 'Import Zendesk', type: :system, set_up: false, authenticated_as:
|
|||
|
||||
Rake::Task['zammad:setup:auto_wizard'].execute
|
||||
|
||||
expect(page).to have_text('Login')
|
||||
expect(page).to have_text(Setting.get('fqdn'))
|
||||
|
||||
# Check that the login is working and also the left navigation side bar is visible.
|
||||
login(
|
||||
username: 'admin@example.com',
|
||||
password: 'test',
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue