Updated Branches: refs/heads/trunk 88a60d222 -> fb20eab51
AMBARI-2952. Installer wizard: Host check label says all hosts passed when all hosts are deleted by user. (Andrii Babiichuk via yusaku) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/fb20eab5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/fb20eab5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/fb20eab5 Branch: refs/heads/trunk Commit: fb20eab51a3f064baddc44f89ea42b16ef38f1da Parents: 88a60d2 Author: Yusaku Sako <[email protected]> Authored: Mon Aug 19 12:12:22 2013 -0700 Committer: Yusaku Sako <[email protected]> Committed: Mon Aug 19 12:12:22 2013 -0700 ---------------------------------------------------------------------- ambari-web/app/messages.js | 1 + ambari-web/app/views/wizard/step3_view.js | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/fb20eab5/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 2833f22..ebf9d08 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -389,6 +389,7 @@ Em.I18n.translations = { 'installer.step3.warnings.allFailed':'Host checks were skipped on {0} hosts that failed to register.', 'installer.step3.warnings.updateChecks.success':'Host Checks successfully updated', 'installer.step3.warnings.updateChecks.failed':'Host Checks update failed', + 'installer.step3.warnings.missingHosts':'There is no registered host', 'installer.step3.removeSelected':'Remove Selected', 'installer.step3.retryFailed':'Retry Failed', 'installer.step3.hosts.status.registering':'Registering', http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/fb20eab5/ambari-web/app/views/wizard/step3_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/wizard/step3_view.js b/ambari-web/app/views/wizard/step3_view.js index d4f8e0a..3cbb9ef 100644 --- a/ambari-web/app/views/wizard/step3_view.js +++ b/ambari-web/app/views/wizard/step3_view.js @@ -40,12 +40,15 @@ App.WizardStep3View = Em.View.extend({ failedHosts++; } }); - if (this.get('controller.isHostHaveWarnings')) { + if (hosts.length==0) { + this.set('status', 'alert-warn'); + this.set('linkText', ''); + this.set('message', Em.I18n.t('installer.step3.warnings.missingHosts')); + } else if (this.get('controller.isHostHaveWarnings')) { this.set('status', 'alert-warn'); this.set('linkText', Em.I18n.t('installer.step3.warnings.linkText')); this.set('message', Em.I18n.t('installer.step3.warnings.fails').format(hosts.length, failedHosts)); - } - else { + } else { this.set('status', 'alert-success'); this.set('linkText', Em.I18n.t('installer.step3.noWarnings.linkText')); if (failedHosts == 0) {
