ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rz...@apache.org
Subject ambari git commit: AMBARI-20058 - 'Final' is not shown correctly in config diff tool and in older versions (rzang)
Date Fri, 17 Feb 2017 20:01:17 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 9260620ec -> 75c359350


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/75c35935
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/75c35935
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/75c35935

Branch: refs/heads/branch-2.5
Commit: 75c359350c86c0eecebc25ea8ad23b6ee65b3db8
Parents: 9260620
Author: Richard Zang <rzang@apache.org>
Authored: Fri Feb 17 11:54:23 2017 -0800
Committer: Richard Zang <rzang@apache.org>
Committed: Fri Feb 17 12:00:57 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/75c35935/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 38b4f83..d3a2c31 100644
--- a/ambari-web/app/templates/common/configs/service_config_category.hbs
+++ b/ambari-web/app/templates/common/configs/service_config_category.hbs
@@ -70,9 +70,7 @@
                         &nbsp;{{t services.service.config.configHistory.configGroup}}</span>
                     {{/if}}
                   {{/if}}
-                  {{#if controller.canEdit}}
-                    {{view App.ControlsView serviceConfigPropertyBinding="this"}}
-                  {{/if}}
+                  {{view App.ControlsView serviceConfigPropertyBinding="this"}}
                   <span class="help-inline">{{errorMessage}}</span>
                   <span class="help-inline">{{warnMessage}}</span>
                 </div>

http://git-wip-us.apache.org/repos/asf/ambari/blob/75c35935/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 de7002c..09abc8b 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'),
 


Mime
View raw message