Repository: ambari Updated Branches: refs/heads/trunk 572251803 -> b89786e88
AMBARI-9114. Kerberos wizard: Back button does not work on Configure Kerberos page. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b89786e8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b89786e8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b89786e8 Branch: refs/heads/trunk Commit: b89786e88608a736c770b2f4135dadb1ee95be59 Parents: 5722518 Author: Jaimin Jetly <[email protected]> Authored: Tue Jan 13 18:36:41 2015 -0800 Committer: Jaimin Jetly <[email protected]> Committed: Tue Jan 13 18:36:49 2015 -0800 ---------------------------------------------------------------------- .../app/controllers/main/admin/kerberos/step2_controller.js | 2 +- ambari-web/app/messages.js | 3 +-- ambari-web/app/routes/add_kerberos_routes.js | 4 ++-- ambari-web/app/views/wizard/controls_view.js | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b89786e8/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js index ae0cdff..a641f4c 100644 --- a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js +++ b/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, http://git-wip-us.apache.org/repos/asf/ambari/blob/b89786e8/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index b1e0ea8..f81e3a5 100644 --- a/ambari-web/app/messages.js +++ b/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', http://git-wip-us.apache.org/repos/asf/ambari/blob/b89786e8/ambari-web/app/routes/add_kerberos_routes.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/add_kerberos_routes.js b/ambari-web/app/routes/add_kerberos_routes.js index 624db82..7c7c069 100644 --- a/ambari-web/app/routes/add_kerberos_routes.js +++ b/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') } }, http://git-wip-us.apache.org/repos/asf/ambari/blob/b89786e8/ambari-web/app/views/wizard/controls_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/wizard/controls_view.js b/ambari-web/app/views/wizard/controls_view.js index 7ac3511..492d7e9 100644 --- a/ambari-web/app/views/wizard/controls_view.js +++ b/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),
