incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject svn commit: r1489564 - in /incubator/ambari/trunk/ambari-web/app/controllers: main/service/info/configs.js wizard/step8_controller.js
Date Tue, 04 Jun 2013 18:59:15 GMT
Author: jaimin
Date: Tue Jun  4 18:58:57 2013
New Revision: 1489564

URL: http://svn.apache.org/r1489564
Log:
AMBARI-2279: Configuration mapping metadata on ambari-web should be computed as per the stack
selection. (jaimin)

Modified:
    incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js
    incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js

Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js?rev=1489564&r1=1489563&r2=1489564&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js Tue Jun
 4 18:58:57 2013
@@ -30,9 +30,11 @@ App.MainServiceInfoConfigsController = E
   customConfig: [],
   isApplyingChanges: false,
   serviceConfigs: App.config.get('preDefinedServiceConfigs'),
-  configs: App.config.get('preDefinedConfigProperties'),
   configMapping: App.config.get('configMapping'),
   customConfigs: require('data/custom_configs'),
+  configs: function() {
+    return  App.config.get('preDefinedConfigProperties');
+  }.property('App.config.preDefinedConfigProperties'),
   
   /**
    * During page load time, we get the host overrides from the server.

Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js?rev=1489564&r1=1489563&r2=1489564&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js Tue Jun 
4 18:58:57 2013
@@ -28,7 +28,6 @@ App.WizardStep8Controller = Em.Controlle
   configs: [],
   globals: [],
   ajaxQueue: [],
-  configMapping: App.config.get('configMapping').all(),
   slaveComponentConfig: null,
   isSubmitDisabled: false,
   hasErrorOccurred: false,
@@ -59,6 +58,10 @@ App.WizardStep8Controller = Em.Controlle
     return this.get('content.services').filterProperty('isSelected', true).filterProperty('isInstalled',
false);
   }.property('content.services').cacheable(),
 
+  configMapping: function() {
+    return App.config.get('configMapping').all();
+  }.property('App.config.configMapping'),
+
   clearStep: function () {
     this.get('services').clear();
     this.get('configs').clear();



Mime
View raw message