Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8A828200C1E for ; Fri, 17 Feb 2017 21:01:19 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 890E2160B57; Fri, 17 Feb 2017 20:01:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D4466160B46 for ; Fri, 17 Feb 2017 21:01:18 +0100 (CET) Received: (qmail 65594 invoked by uid 500); 17 Feb 2017 20:01:18 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 65585 invoked by uid 99); 17 Feb 2017 20:01:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Feb 2017 20:01:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F325ADFC1C; Fri, 17 Feb 2017 20:01:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rzang@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer 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 +0000 (UTC) archived-at: Fri, 17 Feb 2017 20:01:19 -0000 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 Authored: Fri Feb 17 11:54:23 2017 -0800 Committer: Richard Zang 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 @@  {{t services.service.config.configHistory.configGroup}} {{/if}} {{/if}} - {{#if controller.canEdit}} - {{view App.ControlsView serviceConfigPropertyBinding="this"}} - {{/if}} + {{view App.ControlsView serviceConfigPropertyBinding="this"}} {{errorMessage}} {{warnMessage}} 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'),