ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ttho...@apache.org
Subject ambari git commit: AMBARI-20757 - Selecting ignore service checks results in blank dialog box when hitting an error
Date Thu, 13 Apr 2017 18:31:04 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 269ac0a1f -> 7e46412dc


AMBARI-20757 - Selecting ignore service checks results in blank dialog box when hitting an
error


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7e46412d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7e46412d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7e46412d

Branch: refs/heads/trunk
Commit: 7e46412dc694fc78713be079e56d7347a6f2f60c
Parents: 269ac0a
Author: Tim Thorpe <tthorpe@apache.org>
Authored: Thu Apr 13 11:30:41 2017 -0700
Committer: Tim Thorpe <tthorpe@apache.org>
Committed: Thu Apr 13 11:30:41 2017 -0700

----------------------------------------------------------------------
 ambari-web/app/messages.js                                |  1 +
 .../main/admin/stack_upgrade/stack_upgrade_wizard.hbs     | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/7e46412d/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 4513775..8f8d981 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1892,6 +1892,7 @@ Em.I18n.translations = {
   'admin.stackUpgrade.dialog.details.hide': "hide details",
   'admin.stackUpgrade.dialog.notActive': "Waiting to execute the next task...",
   'admin.stackUpgrade.dialog.prepareUpgrade.header': "Preparing the Upgrade...",
+  'admin.stackUpgrade.dialog.skipped.failures':'There were automatically skipped failed steps.
 Please resolve each failure before continuing with the upgrade.',
   'services.service.start':'Start',
   'services.service.stop':'Stop',
   'services.service.metrics':'Metrics',

http://git-wip-us.apache.org/repos/asf/ambari/blob/7e46412d/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
index f6be5d1..b2e8991 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
@@ -101,9 +101,13 @@
         {{#if view.plainManualItem}}
           <div class="panel panel-default details-box">
             <p class="manual-steps-title"><strong>{{t admin.stackUpgrade.dialog.manual}}</strong></p>
-            {{#each message in view.manualItem.messages}}
-              <p class="manual-steps-content">{{message}}</p>
-            {{/each}}
+            {{#if view.manualItem.messages.length}}
+              {{#each message in view.manualItem.messages}}
+                <p class="manual-steps-content">{{message}}</p>
+              {{/each}}
+            {{else}}
+              <p class="manual-steps-content">{{t admin.stackUpgrade.dialog.skipped.failures}}</p>
+            {{/if}}
             <label class="message">
               {{view App.CheckboxView checkedBinding="view.isManualDone" labelTranslate="admin.stackUpgrade.dialog.manualDone"}}
             </label>


Mime
View raw message