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 BB793200BCC for ; Tue, 29 Nov 2016 18:56:13 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id BAACB160B3A; Tue, 29 Nov 2016 17:56:13 +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 35345160B33 for ; Tue, 29 Nov 2016 18:56:12 +0100 (CET) Received: (qmail 46625 invoked by uid 500); 29 Nov 2016 17:56:10 -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 44994 invoked by uid 99); 29 Nov 2016 17:56:09 -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; Tue, 29 Nov 2016 17:56:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6AC28F177F; Tue, 29 Nov 2016 17:56:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Date: Tue, 29 Nov 2016 17:56:47 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [40/55] [abbrv] ambari git commit: AMBARI-18973 Service Auto Start: discard popup appears even when no changes were made, second patch (atkach) archived-at: Tue, 29 Nov 2016 17:56:13 -0000 AMBARI-18973 Service Auto Start: discard popup appears even when no changes were made, second patch (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3c8b1582 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3c8b1582 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3c8b1582 Branch: refs/heads/branch-feature-AMBARI-18634 Commit: 3c8b1582c2f0aa65289b762fd0162049916e9140 Parents: 8de17fa Author: Andrii Tkach Authored: Mon Nov 28 18:36:50 2016 +0200 Committer: Andrii Tkach Committed: Mon Nov 28 20:41:25 2016 +0200 ---------------------------------------------------------------------- ambari-web/app/controllers/main/admin/service_auto_start.js | 2 +- ambari-web/app/templates/main/admin/service_auto_start.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3c8b1582/ambari-web/app/controllers/main/admin/service_auto_start.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/service_auto_start.js b/ambari-web/app/controllers/main/admin/service_auto_start.js index 501e6bb..df07c94 100644 --- a/ambari-web/app/controllers/main/admin/service_auto_start.js +++ b/ambari-web/app/controllers/main/admin/service_auto_start.js @@ -208,7 +208,7 @@ App.MainAdminServiceAutoStartController = Em.Controller.extend({ } }.property('enabledComponents', 'totalComponents'), components: Em.A([componentRecovery]), - enabledComponents: componentRecovery.recovery_enabled ? 1 : 0, + enabledComponents: componentRecovery.recoveryEnabled ? 1 : 0, totalComponents: 1, indicator: function () { var percentage = this.get('enabledComponents') / this.get('totalComponents'); http://git-wip-us.apache.org/repos/asf/ambari/blob/3c8b1582/ambari-web/app/templates/main/admin/service_auto_start.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/service_auto_start.hbs b/ambari-web/app/templates/main/admin/service_auto_start.hbs index 29ec3b3..7334995 100644 --- a/ambari-web/app/templates/main/admin/service_auto_start.hbs +++ b/ambari-web/app/templates/main/admin/service_auto_start.hbs @@ -72,7 +72,7 @@ {{#each component in tab.components}} - {{component.display_name}} + {{component.displayName}} {{view App.MainAdminServiceAutoStartComponentView componentBinding="component" tabBinding="tab"}}