Browse Source

AMBARI-6170. Clarify Database Connectivity warning message.(xiwang)

Xi Wang 11 years ago
parent
commit
faaf799464

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

@@ -1124,7 +1124,7 @@ App.WizardStep7Controller = Em.Controller.extend({
     var ignoredServices = configMap.filterProperty('isCheckIgnored', true);
     if (ignoredServices.length) {
       var displayedServiceNames = ignoredServices.mapProperty('serviceName').map(function(serviceName) {
-        return this.get('content.services').findProperty('serviceName', serviceName).get('displayName');
+        return App.Service.DisplayNames[serviceName];
       }, this);
       this.showDatabaseConnectionWarningPopup(displayedServiceNames, deferred);
     }

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

@@ -617,7 +617,7 @@ Em.I18n.translations = {
   'installer.step7.popup.mySQLWarning.confirmation.header': 'Confirmation: Go to Assign Masters',
   'installer.step7.popup.mySQLWarning.confirmation.body': 'You will be brought back to the \"Assign Masters\" step and will lose all your current customizations. Are you sure?',
   'installer.step7.popup.database.connection.header': 'Database Connectivity Warning',
-  'installer.step7.popup.database.connection.body': 'You have not run the database connectivity check for {0}. It is recommended that you run the check before proceeding to prevent failures during deployment.',
+  'installer.step7.popup.database.connection.body': 'You have not run or passed the database connection test for: {0}. It is highly recommended that you pass the connection test before proceeding to prevent failures during deployment.',
 
   'installer.step7.oozie.database.new': 'New Derby Database',
   'installer.step7.hive.database.new': 'New MySQL Database',