ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject git commit: AMBARI-3799. Advanced repo UI cleanup. (xiwang via yusaku)
Date Tue, 26 Nov 2013 02:11:09 GMT
Updated Branches:
  refs/heads/branch-1.4.2 cb32d6576 -> 241ee6d35


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/241ee6d3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/241ee6d3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/241ee6d3

Branch: refs/heads/branch-1.4.2
Commit: 241ee6d351c84d2f61976a83f62ad04e90ee3eeb
Parents: cb32d65
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Mon Nov 25 18:11:14 2013 -0800
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Mon Nov 25 18:11:42 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/241ee6d3/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'),


Mime
View raw message