diff --git a/app/assets/javascripts/app/controllers/import_zendesk.coffee b/app/assets/javascripts/app/controllers/import_zendesk.coffee index 172693d9d..04ffeee3b 100644 --- a/app/assets/javascripts/app/controllers/import_zendesk.coffee +++ b/app/assets/javascripts/app/controllers/import_zendesk.coffee @@ -10,6 +10,7 @@ class Index extends App.ControllerContent '.zendesk-api-token-error': 'apiTokenErrorMessage' '#zendesk-email': 'zendeskEmail' '#zendesk-api-token': 'zendeskApiToken' + updateMigrationDisplayLoop: 0 events: 'click .js-zendesk-credentials': 'showCredentials' @@ -142,6 +143,7 @@ class Index extends App.ControllerContent ) updateMigration: => + @updateMigrationDisplayLoop += 1 @showImportState() @ajax( id: 'import_status' @@ -160,6 +162,11 @@ class Index extends App.ControllerContent else @$('.js-error').addClass('hide') + if data.message is 'not running' && @updateMigrationDisplayLoop > 16 + @$('.js-error').removeClass('hide') + @$('.js-error').html(App.i18n.translateContent('Background process did not start or has not finished! Please contact your support.')) + return + if data.result is 'in_progress' for key, item of data.data if item.done > item.total diff --git a/app/assets/javascripts/app/views/import/zendesk.jst.eco b/app/assets/javascripts/app/views/import/zendesk.jst.eco index 26d8092b8..72d538d19 100644 --- a/app/assets/javascripts/app/views/import/zendesk.jst.eco +++ b/app/assets/javascripts/app/views/import/zendesk.jst.eco @@ -2,13 +2,13 @@ <%- @Icon('full-logo', 'wizard-logo') %>