Repository: ambari Updated Branches: refs/heads/branch-2.1 420dc339a -> bc995b20f
AMBARI-13802. Update message content for Finalize Upgrade Pre-Check.(xiwang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bc995b20 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bc995b20 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bc995b20 Branch: refs/heads/branch-2.1 Commit: bc995b20ffa3d76dc4ae368ff7955526d5742b83 Parents: 420dc33 Author: Xi Wang <xiw...@apache.org> Authored: Mon Nov 9 11:38:05 2015 -0800 Committer: Xi Wang <xiw...@apache.org> Committed: Mon Nov 9 14:34:02 2015 -0800 ---------------------------------------------------------------------- .../stack_upgrade/stack_upgrade_wizard.hbs | 50 +++++++++++--------- .../admin/stack_upgrade/upgrade_wizard_view.js | 10 +++- 2 files changed, 36 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bc995b20/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 be6596b..45270ed 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 @@ -188,23 +188,23 @@ {{/if}} {{#if view.isSlaveComponentFailuresItem}} <div class="box details-box"> - <p><strong>{{t admin.stackUpgrade.dialog.manual}}</strong></p> - <p><strong>{{t admin.stackUpgrade.dialog.manual.slaveComponentFailures.title}}</strong></p> - - {{#if areSlaveComponentFailuresHostsLoaded}} - {{#if slaveComponentFailuresHosts.length}} - <div>{{t admin.stackUpgrade.dialog.manual.slaveComponentFailures.msg1}}</div> - <ul class="failed-info-list"> - {{#each hostName in slaveComponentFailuresHosts}} - <li>{{hostName}}</li> - {{/each}} - </ul> - <div>{{t admin.stackUpgrade.dialog.manual.slaveComponentFailures.msg2}}</div> - {{/if}} - {{else}} + <p><strong>{{t admin.stackUpgrade.dialog.manual}}</strong></p> + <p><strong>{{t admin.stackUpgrade.dialog.manual.slaveComponentFailures.title}}</strong></p> + <p> + {{#if areSlaveComponentFailuresHostsLoaded}} + {{t admin.stackUpgrade.failedHosts.message}} + <a href="#" {{action showFailedHosts target="view"}}>{{view.failedHostsMessage}}</a> + {{else}} <div class="spinner"></div> - {{/if}} - + {{/if}} + </p> + <p> + {{t admin.stackUpgrade.failedHosts.options}} + <ul> + <li>{{t admin.stackUpgrade.failedHosts.options.first}}</li> + <li>{{t admin.stackUpgrade.failedHosts.options.second}}</li> + </ul> + </p> <label class="message"> {{view Em.Checkbox checkedBinding="view.isManualDone"}} {{t admin.stackUpgrade.dialog.manualDone}} @@ -226,7 +226,7 @@ {{/if}} {{#if view.isServiceCheckFailuresItem}} <div class="box details-box"> - <p><strong>{{t admin.stackUpgrade.dialog.manual}}</strong></p> + <p><strong>{{t admin.stackUpgrade.dialog.manual}}</strong></p> {{#if areServiceCheckFailuresServicenamesLoaded}} {{#if serviceCheckFailuresServicenames.length}} @@ -241,13 +241,17 @@ {{/if}} {{#if slaveComponentFailuresHosts.length}} <p><strong>{{t admin.stackUpgrade.dialog.manual.slaveComponentFailures.title}}</strong></p> - <div>{{t admin.stackUpgrade.dialog.manual.slaveComponentFailures.msg1}}</div> - <ul class="failed-info-list"> - {{#each hostName in slaveComponentFailuresHosts}} - <li>{{hostName}}</li> - {{/each}} + <p> + {{t admin.stackUpgrade.failedHosts.message}} + <a href="#" {{action showFailedHosts target="view"}}>{{view.failedHostsMessage}}</a> + </p> + <p> + {{t admin.stackUpgrade.failedHosts.options}} + <ul> + <li>{{t admin.stackUpgrade.failedHosts.options.first}}</li> + <li>{{t admin.stackUpgrade.failedHosts.options.second}}</li> </ul> - <div>{{t admin.stackUpgrade.dialog.manual.slaveComponentFailures.msg2}}</div> + </p> {{/if}} {{else}} <div class="spinner"></div> http://git-wip-us.apache.org/repos/asf/ambari/blob/bc995b20/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js index b34600b..0aa9ec1 100644 --- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js +++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js @@ -230,8 +230,16 @@ App.upgradeWizardView = Em.View.extend({ var version = App.RepositoryVersion.find().findProperty('displayName', this.get('controller.upgradeVersion')); return version ? version.get('notInstalledHosts') : []; } + if (this.get('isSlaveComponentFailuresItem') && this.get('controller.areSlaveComponentFailuresHostsLoaded')) { + return this.get('controller.slaveComponentFailuresHosts'); + } + if (this.get('isServiceCheckFailuresItem') && this.get('controller.areServiceCheckFailuresServicenamesLoaded')) { + return this.get('controller.slaveComponentFailuresHosts'); + } return []; - }.property('isResolveHostsItem', 'controller.upgradeVersion', 'controller.isLoaded'), + }.property('isResolveHostsItem', 'controller.upgradeVersion', 'controller.isLoaded', + 'controller.areSlaveComponentFailuresHostsLoaded', 'isSlaveComponentFailuresItem', + 'isServiceCheckFailuresItem', 'controller.areServiceCheckFailuresServicenamesLoaded'), /** * @type {string}
