Updated Branches: refs/heads/trunk b157e601c -> 2a04b7a42
AMBARI-3254 Yarn service has discrepancy in property display-type before and after installation. (atkach) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/2a04b7a4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/2a04b7a4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/2a04b7a4 Branch: refs/heads/trunk Commit: 2a04b7a428a5b34f73698a3f7ad410464e118c2c Parents: b157e60 Author: atkach <[email protected]> Authored: Tue Sep 17 13:16:31 2013 +0300 Committer: atkach <[email protected]> Committed: Tue Sep 17 13:16:31 2013 +0300 ---------------------------------------------------------------------- ambari-web/app/utils/config.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2a04b7a4/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index 3591623..17fbbd9 100644 --- a/ambari-web/app/utils/config.js +++ b/ambari-web/app/utils/config.js @@ -276,7 +276,9 @@ App.config = Em.Object.create({ } else if (!this.getBySitename(serviceConfigObj.get('filename')).someProperty('name', index)) { isAdvanced = advancedConfigs.someProperty('name', index); serviceConfigObj.id = 'site property'; - serviceConfigObj.displayType = stringUtils.isSingleLine(serviceConfigObj.value) ? 'advanced' : 'multiLine'; + if (!configsPropertyDef) { + serviceConfigObj.displayType = stringUtils.isSingleLine(serviceConfigObj.value) ? 'advanced' : 'multiLine'; + } serviceConfigObj.displayName = configsPropertyDef ? configsPropertyDef.displayName : index; this.calculateConfigProperties(serviceConfigObj, isAdvanced, advancedConfigs); configs.push(serviceConfigObj);
