瀏覽代碼

AMBARI-3799. Advanced repo UI cleanup. (xiwang via yusaku)

Yusaku Sako 11 年之前
父節點
當前提交
a14f8824fc
共有 1 個文件被更改,包括 4 次插入2 次删除
  1. 4 2
      ambari-web/app/controllers/wizard/step3_controller.js

+ 4 - 2
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'),