소스 검색

AMBARI-3733_2. Register Host: need to check host OS type if specific os group been selected at Advanced Repo in step1. (xiwang)

Xi Wang 11 년 전
부모
커밋
5b4b545073
3개의 변경된 파일4개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      ambari-web/app/controllers/wizard/step3_controller.js
  2. 2 1
      ambari-web/app/messages.js
  3. 1 1
      ambari-web/app/templates/common/modal_popup.hbs

+ 1 - 1
ambari-web/app/controllers/wizard/step3_controller.js

@@ -562,7 +562,7 @@ App.WizardStep3Controller = Em.Controller.extend({
     });
     });
     if (hostsContext.length > 0) { // warning exist
     if (hostsContext.length > 0) { // warning exist
       var repoWarning = {
       var repoWarning = {
-        name: 'Repository for OS not available',
+        name: Em.I18n.t('installer.step3.hostWarningsPopup.repositories.name'),
         hosts: hostsContext,
         hosts: hostsContext,
         category: 'repositories',
         category: 'repositories',
         onSingleHost: false
         onSingleHost: false

+ 2 - 1
ambari-web/app/messages.js

@@ -348,7 +348,7 @@ Em.I18n.translations = {
   'installer.step3.hosts.remove.popup.body':'Are you sure you want to remove the selected host(s)?',
   'installer.step3.hosts.remove.popup.body':'Are you sure you want to remove the selected host(s)?',
   'installer.step3.hostInformation.popup.header':'Error in retrieving host Information',
   'installer.step3.hostInformation.popup.header':'Error in retrieving host Information',
   'installer.step3.hostInformation.popup.body' : 'All bootstrapped hosts registered but unable to retrieve cpu and memory related information',
   'installer.step3.hostInformation.popup.body' : 'All bootstrapped hosts registered but unable to retrieve cpu and memory related information',
-  'installer.step3.hostOsTypeCheck.popup.body' : 'Host registered successfully, but the host operating system type NOT match the selected group in step 1:Advanced Repository Option.<br> You can go back to step 1 OR remove this host. <br>' +
+  'installer.step3.hostOsTypeCheck.popup.body' : 'Host registered successfully, but the host operating system type NOT match the selected group in "Select Stack" step: Advanced Repository Option. You can go back to "Select Stack" step OR remove this host.' +
     'The host type is {0}, but you selected group {1} in step 1.',
     'The host type is {0}, but you selected group {1} in step 1.',
   'installer.step3.hostWarningsPopup.report':'Show Report',
   'installer.step3.hostWarningsPopup.report':'Show Report',
   'installer.step3.hostWarningsPopup.report.header': '<p style="font-family: monospace">######################################<br># Host Checks Report<br>#<br># Generated: ',
   'installer.step3.hostWarningsPopup.report.header': '<p style="font-family: monospace">######################################<br># Host Checks Report<br>#<br># Generated: ',
@@ -367,6 +367,7 @@ Em.I18n.translations = {
   'installer.step3.hostWarningsPopup.summary':'{0} on {1}',
   'installer.step3.hostWarningsPopup.summary':'{0} on {1}',
   'installer.step3.hostWarningsPopup.firewall':'Firewall Issues',
   'installer.step3.hostWarningsPopup.firewall':'Firewall Issues',
   'installer.step3.hostWarningsPopup.repositories':'Repositories Issues',
   'installer.step3.hostWarningsPopup.repositories':'Repositories Issues',
+  'installer.step3.hostWarningsPopup.repositories.name':'Repository for OS not available',
   'installer.step3.hostWarningsPopup.repositories.context':'Host ({0}) has a {1} OS type, But the repositories chosen in "Select Stack" step was {2}.',
   'installer.step3.hostWarningsPopup.repositories.context':'Host ({0}) has a {1} OS type, But the repositories chosen in "Select Stack" step was {2}.',
   'installer.step3.hostWarningsPopup.repositories.message':'The following registered hosts have different Operating System types from the local repositories chosen in "Select Stack" step. You can go back to "Select Stack" step to select another os group OR remove related host.',
   'installer.step3.hostWarningsPopup.repositories.message':'The following registered hosts have different Operating System types from the local repositories chosen in "Select Stack" step. You can go back to "Select Stack" step to select another os group OR remove related host.',
   'installer.step3.hostWarningsPopup.firewall.message':'Firewall is running on the following hosts. Please configure the firewall to allow communications on the ports documented in the <i>Configuring Ports</i> section of  the <a target=\"_blank\" href=\"http://incubator.apache.org/ambari/current/installing-hadoop-using-ambari/content/\">Ambari documentation</a>',
   'installer.step3.hostWarningsPopup.firewall.message':'Firewall is running on the following hosts. Please configure the firewall to allow communications on the ports documented in the <i>Configuring Ports</i> section of  the <a target=\"_blank\" href=\"http://incubator.apache.org/ambari/current/installing-hadoop-using-ambari/content/\">Ambari documentation</a>',

+ 1 - 1
ambari-web/app/templates/common/modal_popup.hbs

@@ -49,7 +49,7 @@
       <div class="modal-footer">
       <div class="modal-footer">
         {{#if view.hasFooterCheckbox}}
         {{#if view.hasFooterCheckbox}}
           <label id="footer-checkbox">{{view Ember.Checkbox classNames="checkbox" checkedBinding="view.isNotShowBgChecked"}} &nbsp;
           <label id="footer-checkbox">{{view Ember.Checkbox classNames="checkbox" checkedBinding="view.isNotShowBgChecked"}} &nbsp;
-          {{t admin.userSettings.notShowBgOperations}}</label>
+          {{t app.settings.notShowBgOperations}}</label>
         {{/if}}
         {{/if}}
         {{#if view.secondary}}
         {{#if view.secondary}}
           <a class="btn" {{action onSecondary target="view"}}>{{view.secondary}}</a>
           <a class="btn" {{action onSecondary target="view"}}>{{view.secondary}}</a>