You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2015/01/16 00:39:04 UTC
ambari git commit: AMBARI-9157. Kerberos wizard: Refresh on stop
services page and proceeding ahead throws JS error. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk fcce59e8c -> d1c99a06b
AMBARI-9157. Kerberos wizard: Refresh on stop services page and proceeding ahead throws JS error. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d1c99a06
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d1c99a06
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d1c99a06
Branch: refs/heads/trunk
Commit: d1c99a06b8e7cccc9bd534f8dc4681dcbc876c7e
Parents: fcce59e
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Thu Jan 15 13:20:20 2015 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Thu Jan 15 15:38:51 2015 -0800
----------------------------------------------------------------------
.../controllers/main/admin/kerberos/wizard_controller.js | 9 +++++----
ambari-web/app/routes/add_kerberos_routes.js | 7 ++++---
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1c99a06/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
index 995e1af..ef7a351 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
@@ -32,6 +32,8 @@ App.KerberosWizardController = App.WizardController.extend({
*/
hideBackButton: true,
+ kerberosDescriptorConfigs: null,
+
content: Em.Object.create({
controllerName: 'kerberosWizardController',
serviceName: 'KERBEROS',
@@ -41,7 +43,6 @@ App.KerberosWizardController = App.WizardController.extend({
services: [],
advancedServiceConfig: null,
serviceConfigProperties: [],
- kerberosDescriptorConfigs: null,
failedTask: null
}),
@@ -89,7 +90,7 @@ App.KerberosWizardController = App.WizardController.extend({
},
updateClusterEnvData: function (configs) {
- var kerberosDescriptor = this.get('content.kerberosDescriptorConfigs');
+ var kerberosDescriptor = this.kerberosDescriptorConfigs;
configs['security_enabled'] = true;
configs['kerberos_domain'] = kerberosDescriptor.properties.realm;
return configs;
@@ -166,7 +167,7 @@ App.KerberosWizardController = App.WizardController.extend({
loadKerberosDescriptorConfigs: function () {
var kerberosDescriptorConfigs = this.getDBProperty('kerberosDescriptorConfigs');
- this.set('content.kerberosDescriptorConfigs', kerberosDescriptorConfigs);
+ this.kerberosDescriptorConfigs = kerberosDescriptorConfigs;
},
@@ -196,7 +197,7 @@ App.KerberosWizardController = App.WizardController.extend({
saveKerberosDescriptorConfigs: function (kerberosDescriptorConfigs) {
this.setDBProperty('kerberosDescriptorConfigs',kerberosDescriptorConfigs);
- this.set('content.kerberosDescriptorConfigs', kerberosDescriptorConfigs);
+ this.kerberosDescriptorConfigs = kerberosDescriptorConfigs;
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1c99a06/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 7c7c069..11962af 100644
--- a/ambari-web/app/routes/add_kerberos_routes.js
+++ b/ambari-web/app/routes/add_kerberos_routes.js
@@ -153,6 +153,7 @@ module.exports = App.WizardRoute.extend({
router.transitionTo('step3');
}
}),
+
step3: Em.Route.extend({
route: '/step3',
@@ -244,9 +245,9 @@ module.exports = App.WizardRoute.extend({
var stepController = router.get('kerberosWizardStep6Controller');
controller.setLowerStepsDisable(6);
controller.dataLoading().done(function () {
+ controller.loadAllPriorSteps();
controller.getClusterEnvData().done(function (data) {
- controller.loadAllPriorSteps();
- var kerberosDescriptor = controller.get('content.kerberosDescriptorConfigs');
+ var kerberosDescriptor = controller.get('kerberosDescriptorConfigs');
stepController.setRequest(data, kerberosDescriptor);
controller.connectOutlet('kerberosWizardStep6', controller.get('content'));
});
@@ -257,7 +258,7 @@ module.exports = App.WizardRoute.extend({
var controller = router.get('kerberosWizardController');
controller.getClusterEnvData().done(function (data) {
var stepController = router.get('kerberosWizardStep6Controller');
- var kerberosDescriptor = controller.get('content.kerberosDescriptorConfigs');
+ var kerberosDescriptor = controller.get('kerberosDescriptorConfigs');
stepController.setRequest(data, kerberosDescriptor);
stepController.loadStep();
});