소스 검색

AMBARI-2279: Configuration mapping metadata on ambari-web should be computed as per the stack selection. (jaimin)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1489564 13f79535-47bb-0310-9956-ffa450edef68
Jaimin Jetly 12 년 전
부모
커밋
c5dece3b29
2개의 변경된 파일7개의 추가작업 그리고 2개의 파일을 삭제
  1. 3 1
      ambari-web/app/controllers/main/service/info/configs.js
  2. 4 1
      ambari-web/app/controllers/wizard/step8_controller.js

+ 3 - 1
ambari-web/app/controllers/main/service/info/configs.js

@@ -30,9 +30,11 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
   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.

+ 4 - 1
ambari-web/app/controllers/wizard/step8_controller.js

@@ -28,7 +28,6 @@ App.WizardStep8Controller = Em.Controller.extend({
   configs: [],
   globals: [],
   ajaxQueue: [],
-  configMapping: App.config.get('configMapping').all(),
   slaveComponentConfig: null,
   isSubmitDisabled: false,
   hasErrorOccurred: false,
@@ -59,6 +58,10 @@ App.WizardStep8Controller = Em.Controller.extend({
     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();