Repository: ambari Updated Branches: refs/heads/trunk ce962b73d -> 65b59e51f
AMBARI-12160. It is not possible to change Oozie DB/Hive DB after blueprint install (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/65b59e51 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/65b59e51 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/65b59e51 Branch: refs/heads/trunk Commit: 65b59e51fcd5e941fe1e23601d104fc41828a504 Parents: ce962b7 Author: Aleksandr Kovalenko <akovale...@hortonworks.com> Authored: Fri Jun 26 13:26:58 2015 +0300 Committer: Aleksandr Kovalenko <akovale...@hortonworks.com> Committed: Fri Jun 26 13:26:58 2015 +0300 ---------------------------------------------------------------------- ambari-web/app/utils/config.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/65b59e51/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index 14c1c5f..559bab9 100644 --- a/ambari-web/app/utils/config.js +++ b/ambari-web/app/utils/config.js @@ -304,11 +304,12 @@ App.config = Em.Object.create({ var value = this.parseValue(properties[index], configsPropertyDef, advancedConfig); var serviceConfigObj = Em.Object.create({ name: index, + displayName: (configsPropertyDef && Em.get(configsPropertyDef, 'displayName')) || index, value: value, savedValue: value, recommendedValue: advancedConfig ? Em.get(advancedConfig, 'recommendedValue') : null, filename: filename, - isUserProperty: !advancedConfig, + isUserProperty: !configsPropertyDef, isVisible: !!service, isOverridable: true, isReconfigurable: true, @@ -336,7 +337,7 @@ App.config = Em.Object.create({ if (!this.getBySiteName(serviceConfigObj.get('filename')).someProperty('name', index)) { if (configsPropertyDef) { if (Em.get(configsPropertyDef, 'isRequiredByAgent') === false) { - configs.push(serviceConfigObj); + configs.push(App.ServiceConfigProperty.create(serviceConfigObj)); continue; } this.handleSpecialProperties(serviceConfigObj);
