瀏覽代碼

AMBARI-9114. Kerberos wizard: Back button does not work on Configure Kerberos page. (jaimin)

Jaimin Jetly 10 年之前
父節點
當前提交
b89786e886

+ 1 - 1
ambari-web/app/controllers/main/admin/kerberos/step2_controller.js

@@ -36,7 +36,7 @@ App.KerberosWizardStep2Controller = App.WizardStep7Controller.extend({
   addMiscTabToPage: false,
 
   /**
-   * @type {boolean} true if test conection to hosts is in progress
+   * @type {boolean} true if test connection to hosts is in progress
    */
   testConnectionInProgress: false,
 

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

@@ -410,8 +410,7 @@ Em.I18n.translations = {
 
   'installer.controls.slaveComponentGroups':' Groups',
   'installer.controls.serviceConfigPopover.title':'{0}<br><small>{1}</small>',
-  'installer.controls.checkConnection.popover':'This action will check accessibility of all hosts to Ambari installed {0} host and port ' +
-    'and accessibility of Ambari installed {0} host to external {0} host',
+  'installer.controls.checkConnection.popover':'This action will check accessibility of {0} host and port from Ambari Server host',
   'installer.controls.serviceConfigMultipleHosts.other':'1 other',
   'installer.controls.serviceConfigMultipleHosts.others':'{0} others',
   'installer.controls.serviceConfigMasterHosts.header':'{0} Hosts',

+ 2 - 2
ambari-web/app/routes/add_kerberos_routes.js

@@ -34,7 +34,7 @@ module.exports = App.WizardRoute.extend({
         secondary: null,
 
         onClose: function () {
-          var step2Controller = router.get('kerberosWizardStep2Controller')
+          var step2Controller = router.get('kerberosWizardStep2Controller');
           if (step2Controller.get('testConnectionInProgress')) {
             step2Controller.showConnectionInProgressPopup(this.exitWizard);
           } else {
@@ -141,7 +141,7 @@ module.exports = App.WizardRoute.extend({
     back: function(router) {
       var controller = router.get('kerberosWizardStep2Controller');
       if (!controller.get('isBackBtnDisabled')) {
-        Em.Router.transitionTo('step1')
+        router.transitionTo('step1')
       }
     },
 

+ 1 - 1
ambari-web/app/views/wizard/controls_view.js

@@ -905,7 +905,7 @@ App.CheckDBConnectionView = Ember.View.extend({
   didInsertElement: function() {
     var kdc = this.get('parentView.categoryConfigsAll').findProperty('name', 'kdc_type');
     if (kdc) {
-      var name = kdc.get('value') == 'Existing MIT KDC' ? 'KDC' : 'Active Directory';
+      var name = kdc.get('value') == 'Existing MIT KDC' ? 'KDC' : 'AD';
       App.popover(this.$(), {
         title: Em.I18n.t('services.service.config.database.btn.idle'),
         content: Em.I18n.t('installer.controls.checkConnection.popover').format(name),