You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2013/11/06 00:00:39 UTC
[5/5] git commit: AMBARI-3697. JS exception trying to calculate
dynamic configs in branch-1.4. (srimanth)
AMBARI-3697. JS exception trying to calculate dynamic configs in branch-1.4. (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/4720ee5c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/4720ee5c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/4720ee5c
Branch: refs/heads/branch-1.4
Commit: 4720ee5c693f757d1a27ebef704d64131d2cc365
Parents: 3a34751
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Tue Nov 5 14:47:21 2013 -0800
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Tue Nov 5 14:47:21 2013 -0800
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step7_controller.js | 2 +-
ambari-web/app/utils/config.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/4720ee5c/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index efca8ae..b46e6eb 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -93,7 +93,7 @@ App.WizardStep7Controller = Em.Controller.extend({
configs = App.config.fileConfigsIntoTextarea(configs, 'capacity-scheduler.xml');
}
//STEP 6: Distribute configs by service and wrap each one in App.ServiceConfigProperty (configs -> serviceConfigs)
- var serviceConfigs = App.config.renderConfigs(configs, storedConfigs, this.get('allInstalledServiceNames'), this.get('selectedServiceNames'), localDB);
+ var serviceConfigs = App.config.renderConfigs(configs, storedConfigs, this.get('allInstalledServiceNames'), this.get('selectedServiceNames'));
this.set('stepConfigs', serviceConfigs);
this.activateSpecialConfigs();
this.set('selectedService', this.get('stepConfigs').filterProperty('showConfig', true).objectAt(0));
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/4720ee5c/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index ab421be..054c234 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -468,7 +468,7 @@ App.config = Em.Object.create({
* @param localDB
* @return {Array}
*/
- renderConfigs: function (configs, storedConfigs, allInstalledServiceNames, selectedServiceNames, localDB) {
+ renderConfigs: function (configs, storedConfigs, allInstalledServiceNames, selectedServiceNames) {
var renderedServiceConfigs = [];
var localDB = {
hosts: App.db.getHosts(),