AMBARI-7177 Property: fs.defaultFS has final flag - 'true' in downloaded core-site.xml but saved after secutity as false. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f76e5c9f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f76e5c9f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f76e5c9f Branch: refs/heads/branch-alerts-dev Commit: f76e5c9f3d44290477d08188f514df505a8c7c6f Parents: e3edd77 Author: aBabiichuk <ababiic...@cybervisiontech.com> Authored: Fri Sep 5 19:04:44 2014 +0300 Committer: aBabiichuk <ababiic...@cybervisiontech.com> Committed: Fri Sep 5 19:04:54 2014 +0300 ---------------------------------------------------------------------- .../main/admin/security/security_progress_controller.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f76e5c9f/ambari-web/app/controllers/main/admin/security/security_progress_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/security/security_progress_controller.js b/ambari-web/app/controllers/main/admin/security/security_progress_controller.js index 33c3208..4eb2fb6 100644 --- a/ambari-web/app/controllers/main/admin/security/security_progress_controller.js +++ b/ambari-web/app/controllers/main/admin/security/security_progress_controller.js @@ -279,12 +279,16 @@ App.MainAdminSecurityProgressController = Em.Controller.extend({ */ applyConfigurationsToCluster: function () { var configData = this.get('serviceConfigTags').map(function (_serviceConfig) { - return { + var res = { type: _serviceConfig.siteName, tag: _serviceConfig.newTagName, properties: _serviceConfig.configs, service_config_version_note: Em.I18n.t('admin.security.step4.save.configuration.note') }; + if (_serviceConfig.properties_attributes) { + res['properties_attributes'] = _serviceConfig.properties_attributes + } + return res; }, this); var selectedServices = this.get('secureServices'); @@ -360,7 +364,11 @@ App.MainAdminSecurityProgressController = Em.Controller.extend({ command.set('isSuccess', false); command.set('isError', true); } - _tag.configs = data.items.findProperty('type', _tag.siteName).properties; + var cfg = data.items.findProperty('type', _tag.siteName); + _tag.configs = cfg.properties; + if (cfg.properties_attributes) { + _tag.properties_attributes = cfg.properties_attributes; + } }, this); if (this.manageSecureConfigs()) { this.escapeXMLCharacters(this.get('serviceConfigTags'));
