You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2013/10/22 12:29:28 UTC
git commit: AMBARI-3569. "Config" step refresh. (onechiporenko)
Updated Branches:
refs/heads/trunk 139537c77 -> 38569ba59
AMBARI-3569. "Config" step refresh. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/38569ba5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/38569ba5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/38569ba5
Branch: refs/heads/trunk
Commit: 38569ba592a467d2e716f2906b4f0ec049c855e9
Parents: 139537c
Author: Oleg Nechiporenko <cv...@yahoo.com>
Authored: Tue Oct 22 13:26:27 2013 +0300
Committer: Oleg Nechiporenko <cv...@yahoo.com>
Committed: Tue Oct 22 13:26:27 2013 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/add_controller.js | 3 +++
ambari-web/app/routes/add_service_routes.js | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/38569ba5/ambari-web/app/controllers/main/service/add_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/add_controller.js b/ambari-web/app/controllers/main/service/add_controller.js
index 3d1dbb8..49010fd 100644
--- a/ambari-web/app/controllers/main/service/add_controller.js
+++ b/ambari-web/app/controllers/main/service/add_controller.js
@@ -222,6 +222,9 @@ App.AddServiceController = App.WizardController.extend({
loadServiceConfigProperties: function() {
this._super();
+ if (!this.get('content.services')) {
+ this.loadServices();
+ }
if (this.get('currentStep') > 1 && this.get('currentStep') < 6) {
this.set('content.skipConfigStep', this.skipConfigStep());
this.get('isStepDisabled').findProperty('step', 4).set('value', this.get('content.skipConfigStep'));
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/38569ba5/ambari-web/app/routes/add_service_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_service_routes.js b/ambari-web/app/routes/add_service_routes.js
index df71498..be2e01b 100644
--- a/ambari-web/app/routes/add_service_routes.js
+++ b/ambari-web/app/routes/add_service_routes.js
@@ -171,7 +171,6 @@ module.exports = Em.Route.extend({
addServiceController.saveSlaveComponentHosts(wizardStep6Controller);
addServiceController.get('content').set('serviceConfigProperties', null);
App.db.setServiceConfigProperties(null);
- addServiceController.loadAdvancedConfigs();
router.transitionTo('step4');
}
}
@@ -185,6 +184,7 @@ module.exports = Em.Route.extend({
controller.setCurrentStep('4');
controller.dataLoading().done(function () {
controller.loadAllPriorSteps();
+ controller.loadAdvancedConfigs();
controller.connectOutlet('wizardStep7', controller.get('content'));
})
},