You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/12/01 12:26:41 UTC
ambari git commit: AMBARI-14126 Override icon doesn't show up when
group is not default. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 95a71a68f -> 5cc99b224
AMBARI-14126 Override icon doesn't show up when group is not default. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5cc99b22
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5cc99b22
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5cc99b22
Branch: refs/heads/trunk
Commit: 5cc99b224c8870815f978b7bc631275843c3bb06
Parents: 95a71a6
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Tue Dec 1 13:20:45 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Tue Dec 1 13:26:28 2015 +0200
----------------------------------------------------------------------
ambari-web/app/views/common/configs/controls_view.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5cc99b22/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 6232a27..78fd950 100644
--- a/ambari-web/app/views/common/configs/controls_view.js
+++ b/ambari-web/app/views/common/configs/controls_view.js
@@ -26,20 +26,20 @@ App.ControlsView = Ember.View.extend({
serviceConfigProperty: null,
showActions: function() {
- return App.isAccessible('ADMIN') && this.get('serviceConfigProperty.isEditable') && this.get('serviceConfigProperty.isRequiredByAgent') && !this.get('serviceConfigProperty.isComparison');
+ return App.isAccessible('ADMIN') && this.get('serviceConfigProperty.isRequiredByAgent') && !this.get('serviceConfigProperty.isComparison');
}.property('serviceConfigProperty.isEditable', 'serviceConfigProperty.isRequiredByAgent', 'serviceConfigProperty.isComparison'),
showSwitchToGroup: Em.computed.and('!serviceConfigProperty.isEditable', 'serviceConfigProperty.group'),
showIsFinal: Em.computed.alias('serviceConfigProperty.supportsFinal'),
- showRemove: Em.computed.and('showActions', 'serviceConfigProperty.isRemovable'),
+ showRemove: Em.computed.and('showActions', 'serviceConfigProperty.isEditable', 'serviceConfigProperty.isRemovable'),
showOverride: Em.computed.and('showActions', 'serviceConfigProperty.isPropertyOverridable'),
- showUndo: Em.computed.and('showActions', '!serviceConfigProperty.cantBeUndone', 'serviceConfigProperty.isNotDefaultValue'),
+ showUndo: Em.computed.and('showActions', 'serviceConfigProperty.isEditable', '!serviceConfigProperty.cantBeUndone', 'serviceConfigProperty.isNotDefaultValue'),
- showSetRecommended: Em.computed.and('showActions', 'serviceConfigProperty.recommendedValueExists')
+ showSetRecommended: Em.computed.and('showActions', 'serviceConfigProperty.isEditable', 'serviceConfigProperty.recommendedValueExists')
});