Updated Branches: refs/heads/trunk b3669eebc -> a14f8824f
AMBARI-3799. Advanced repo UI cleanup. (xiwang via yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a14f8824 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a14f8824 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a14f8824 Branch: refs/heads/trunk Commit: a14f8824fca067e7b2766f035d9ba61435b85e84 Parents: b3669ee Author: Yusaku Sako <[email protected]> Authored: Mon Nov 25 18:11:14 2013 -0800 Committer: Yusaku Sako <[email protected]> Committed: Mon Nov 25 18:11:14 2013 -0800 ---------------------------------------------------------------------- ambari-web/app/controllers/wizard/step3_controller.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a14f8824/ambari-web/app/controllers/wizard/step3_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step3_controller.js b/ambari-web/app/controllers/wizard/step3_controller.js index dc04788..ae65e7a 100644 --- a/ambari-web/app/controllers/wizard/step3_controller.js +++ b/ambari-web/app/controllers/wizard/step3_controller.js @@ -1160,8 +1160,10 @@ App.WizardStep3Controller = Em.Controller.extend({ var warnings = this.get('warnings'); var warningsByHost = self.get('warningsByHost').slice(); warningsByHost.shift(); - var issues = warnings.length + ' ' + (warnings.length === 1 ? Em.I18n.t('installer.step3.hostWarningsPopup.issue') : Em.I18n.t('installer.step3.hostWarningsPopup.issues')); - var hostsNumber = warningsByHost.length - warningsByHost.filterProperty('warnings.length', 0).length; + var issuesNumber = warnings.length + repoCategoryWarnings.length; + var issues = issuesNumber + ' ' + (issuesNumber.length === 1 ? Em.I18n.t('installer.step3.hostWarningsPopup.issue') : Em.I18n.t('installer.step3.hostWarningsPopup.issues')); + var repoHostsNumber = (repoCategoryWarnings.length > 0 ? repoCategoryWarnings[0].hosts.length : 0); + var hostsNumber = repoHostsNumber + warningsByHost.length - warningsByHost.filterProperty('warnings.length', 0).length; var hosts = hostsNumber + ' ' + (hostsNumber === 1 ? Em.I18n.t('installer.step3.hostWarningsPopup.host') : Em.I18n.t('installer.step3.hostWarningsPopup.hosts')); return Em.I18n.t('installer.step3.hostWarningsPopup.summary').format(issues, hosts); }.property('warnings', 'warningsByHost'),
