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 15F1A200C6A for ; Wed, 29 Mar 2017 15:57:18 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 14780160BA1; Wed, 29 Mar 2017 13:57:18 +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 5639A160BA9 for ; Wed, 29 Mar 2017 15:57:16 +0200 (CEST) Received: (qmail 18186 invoked by uid 500); 29 Mar 2017 13:57:13 -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 15612 invoked by uid 99); 29 Mar 2017 13:57:10 -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; Wed, 29 Mar 2017 13:57:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8F7A8E9695; Wed, 29 Mar 2017 13:57:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: oleewere@apache.org To: commits@ambari.apache.org Date: Wed, 29 Mar 2017 13:57:56 -0000 Message-Id: In-Reply-To: <4d60496393ea4efdbd9a6f61570bbe9d@git.apache.org> References: <4d60496393ea4efdbd9a6f61570bbe9d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [48/67] [abbrv] ambari git commit: AMBARI-20604. Infinite spinner near config property (akovalenko) archived-at: Wed, 29 Mar 2017 13:57:18 -0000 AMBARI-20604. Infinite spinner near config property (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/993cd02a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/993cd02a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/993cd02a Branch: refs/heads/branch-dev-logsearch Commit: 993cd02a9ad5b9610e8007885b582668066de429 Parents: d14dba6 Author: Aleksandr Kovalenko Authored: Tue Mar 28 13:57:13 2017 +0300 Committer: Aleksandr Kovalenko Committed: Tue Mar 28 14:57:16 2017 +0300 ---------------------------------------------------------------------- ambari-web/app/controllers/wizard/step7_controller.js | 4 ++-- ambari-web/app/templates/common/configs/overriddenProperty.hbs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/993cd02a/ambari-web/app/controllers/wizard/step7_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js index dd3bfcb..8e14b70 100644 --- a/ambari-web/app/controllers/wizard/step7_controller.js +++ b/ambari-web/app/controllers/wizard/step7_controller.js @@ -375,7 +375,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E for (var prop in config.properties) { var fileName = App.config.getOriginalFileName(config.type); var serviceConfig = serviceConfigs.filterProperty('name', prop).findProperty('filename', fileName); - if (serviceConfig) { + if (serviceConfig && serviceConfig.get('isOriginalSCP')) { var value = App.config.formatPropertyValue(serviceConfig, config.properties[prop]); var isFinal = !!(config.properties_attributes && config.properties_attributes.final && config.properties_attributes.final[prop]); @@ -1172,7 +1172,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E var modelGroup = App.ServiceConfigGroup.find(item.id); modelGroup.set('properties', []); item.properties.forEach(function (propertyData) { - var overriddenSCP, parentSCP = service.configs.filterProperty('filename', propertyData.filename).findProperty('name', propertyData.name); + var overriddenSCP, parentSCP = service.configs.filterProperty('filename', propertyData.filename).filterProperty('isOriginalSCP').findProperty('name', propertyData.name); if (parentSCP) { App.config.createOverride(parentSCP, propertyData, modelGroup) } else { http://git-wip-us.apache.org/repos/asf/ambari/blob/993cd02a/ambari-web/app/templates/common/configs/overriddenProperty.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/overriddenProperty.hbs b/ambari-web/app/templates/common/configs/overriddenProperty.hbs index 7d8e594..ff3e812 100644 --- a/ambari-web/app/templates/common/configs/overriddenProperty.hbs +++ b/ambari-web/app/templates/common/configs/overriddenProperty.hbs @@ -54,7 +54,7 @@ {{view.overriddenSCP.errorMessage}} {{/if}} {{else}} - {{view.overriddenSCP.group.switchGroupTextShort}} {{view App.SpinnerView}} + {{view.overriddenSCP.group.switchGroupTextShort}} {{/if}} {{/if}}