You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/02/17 22:06:46 UTC
[47/50] [abbrv] ambari git commit: AMBARI-20058 - 'Final' is not
shown correctly in config diff tool and in older versions (rzang)
AMBARI-20058 - 'Final' is not shown correctly in config diff tool and in older versions (rzang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8dabd55a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8dabd55a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8dabd55a
Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 8dabd55a448120336309039a6eb9fae11295c6a0
Parents: db51ba4
Author: Richard Zang <rz...@apache.org>
Authored: Fri Feb 17 11:54:23 2017 -0800
Committer: Richard Zang <rz...@apache.org>
Committed: Fri Feb 17 11:54:23 2017 -0800
----------------------------------------------------------------------
.../app/templates/common/configs/service_config_category.hbs | 4 +---
ambari-web/app/views/common/configs/controls_view.js | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8dabd55a/ambari-web/app/templates/common/configs/service_config_category.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/service_config_category.hbs b/ambari-web/app/templates/common/configs/service_config_category.hbs
index fbcb828..c9bedc5 100644
--- a/ambari-web/app/templates/common/configs/service_config_category.hbs
+++ b/ambari-web/app/templates/common/configs/service_config_category.hbs
@@ -73,9 +73,7 @@
{{t services.service.config.configHistory.configGroup}}</span>
{{/if}}
{{/if}}
- {{#if controller.canEdit}}
- {{view App.ControlsView serviceConfigPropertyBinding="this"}}
- {{/if}}
+ {{view App.ControlsView serviceConfigPropertyBinding="this"}}
{{#if errorMessage}}
<span class="help-block validation-block">{{errorMessage}}</span>
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/8dabd55a/ambari-web/app/views/common/configs/controls_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/controls_view.js b/ambari-web/app/views/common/configs/controls_view.js
index 8894ea6..e9464a3 100644
--- a/ambari-web/app/views/common/configs/controls_view.js
+++ b/ambari-web/app/views/common/configs/controls_view.js
@@ -35,7 +35,7 @@ App.ControlsView = Ember.View.extend({
showRemove: Em.computed.and('showActions', 'serviceConfigProperty.isEditable', 'serviceConfigProperty.isRemovable'),
- showOverride: Em.computed.and('showActions', 'serviceConfigProperty.isPropertyOverridable'),
+ showOverride: Em.computed.and('showActions', 'serviceConfigProperty.isPropertyOverridable', 'controller.canEdit'),
showUndo: Em.computed.and('showActions', 'serviceConfigProperty.isEditable', '!serviceConfigProperty.cantBeUndone', 'serviceConfigProperty.isNotDefaultValue'),