Explorar o código

AMBARI-6206. BGO popup: Incorrect number of tasks in category. (akovalenko)

Aleksandr Kovalenko %!s(int64=11) %!d(string=hai) anos
pai
achega
3453540728
Modificáronse 2 ficheiros con 3 adicións e 3 borrados
  1. 1 1
      ambari-web/app/messages.js
  2. 2 2
      ambari-web/app/utils/host_progress_popup.js

+ 1 - 1
ambari-web/app/messages.js

@@ -660,7 +660,7 @@ Em.I18n.translations = {
   'installer.step9.hostLog.popup.categories.in_progress':'In Progress',
   'installer.step9.hostLog.popup.categories.failed':'Failed',
   'installer.step9.hostLog.popup.categories.completed':'Success',
-  'installer.step9.hostLog.popup.categories.aborted':'Cancelled',
+  'installer.step9.hostLog.popup.categories.aborted':'Aborted',
   'installer.step9.hostLog.popup.categories.timedout':'Timed Out',
   'installer.step9.hostLog.popup.noTasksToShow':'No tasks to show',
   'installer.step9.host.status.noTasks': 'Ambari server did not schedule any tasks on the host. Either the service component on the host is already in installed state <b>OR</b> the pre-check of host reachability failed.',

+ 2 - 2
ambari-web/app/utils/host_progress_popup.js

@@ -142,7 +142,7 @@ App.HostPopup = Em.Object.create({
     if (isFailed) {
       status = ['FAILED', 'icon-exclamation-sign', 'progress-danger', false];
     } else if (isAborted) {
-      status = ['CANCELLED', 'icon-minus', 'progress-warning', false];
+      status = ['ABORTED', 'icon-minus', 'progress-warning', false];
     } else if (isTimedout) {
       status = ['TIMEDOUT', 'icon-time', 'progress-warning', false];
     } else if (isInProgress) {
@@ -255,7 +255,7 @@ App.HostPopup = Em.Object.create({
       var allNewServices = [];
       var statuses = {
         'FAILED': ['FAILED', 'icon-exclamation-sign', 'progress-danger', false],
-        'ABORTED': ['CANCELLED', 'icon-minus', 'progress-warning', false],
+        'ABORTED': ['ABORTED', 'icon-minus', 'progress-warning', false],
         'TIMEDOUT': ['TIMEDOUT', 'icon-time', 'progress-warning', false],
         'IN_PROGRESS': ['IN_PROGRESS', 'icon-cogs', 'progress-info', true],
         'COMPLETED': ['SUCCESS', 'icon-ok', 'progress-success', false]