浏览代码

AMBARI-1880. stacks2 API uses type to refer to config tags and no longer exposes "filename" as a property. (srimanth via yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1467034 13f79535-47bb-0310-9956-ffa450edef68
Yusaku Sako 12 年之前
父节点
当前提交
344f066487
共有 3 个文件被更改,包括 5 次插入2 次删除
  1. 3 0
      CHANGES.txt
  2. 1 1
      ambari-web/app/utils/ajax.js
  3. 1 1
      ambari-web/app/utils/config.js

+ 3 - 0
CHANGES.txt

@@ -690,6 +690,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1880. stacks2 API uses "type" to refer to config tags and no longer
+ exposes "filename" as a property. (srimanth via yusaku)
+
  AMBARI-1873. HUE pid and log dir labels are flip flopped. (yusaku)
 
  AMBARI-1878. Host overrides functionality broken in wizard Step7 controller.

+ 1 - 1
ambari-web/app/utils/ajax.js

@@ -208,7 +208,7 @@ var urls = {
     }
   },
   'config.advanced.global': {
-    'real': '{stack2VersionUrl}/stackServices?fields=configurations/StackConfigurations/filename',
+    'real': '{stack2VersionUrl}/stackServices?fields=configurations/StackConfigurations/type',
     'mock': '/data/wizard/stack/hdp/version130/global.json',
     'format': function(data){
       return {

+ 1 - 1
ambari-web/app/utils/config.js

@@ -515,7 +515,7 @@ App.config = Em.Object.create({
     if(data.items!=null){
       data.items.forEach(function(service){
         service.configurations.forEach(function(config){
-          if("global.xml" === config.StackConfigurations.filename){
+          if("global.xml" === config.StackConfigurations.type){
             if(!(config.StackConfigurations.property_name in globalPropertyToServicesMap)){
               globalPropertyToServicesMap[config.StackConfigurations.property_name] = [];
             }