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 D324C200C09 for ; Wed, 25 Jan 2017 15:02:16 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D1B63160B50; Wed, 25 Jan 2017 14:02:16 +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 273FA160B4E for ; Wed, 25 Jan 2017 15:02:16 +0100 (CET) Received: (qmail 22684 invoked by uid 500); 25 Jan 2017 14:02:15 -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 22675 invoked by uid 99); 25 Jan 2017 14:02:15 -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, 25 Jan 2017 14:02:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 307A2DFC12; Wed, 25 Jan 2017 14:02:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: onechiporenko@apache.org To: commits@ambari.apache.org Message-Id: <490247e2bc7f4259b61a8a3840ca6799@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-19703. "Add Config Property" causes JS-error (onechiporenko) Date: Wed, 25 Jan 2017 14:02:15 +0000 (UTC) archived-at: Wed, 25 Jan 2017 14:02:17 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.5 82f8e8107 -> f03fed539 AMBARI-19703. "Add Config Property" causes JS-error (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f03fed53 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f03fed53 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f03fed53 Branch: refs/heads/branch-2.5 Commit: f03fed5394d9ef36a35a4fc5c8545c0d0e11e27d Parents: 82f8e81 Author: Oleg Nechiporenko Authored: Wed Jan 25 11:58:52 2017 +0200 Committer: Oleg Nechiporenko Committed: Wed Jan 25 16:02:09 2017 +0200 ---------------------------------------------------------------------- .../app/views/common/configs/service_configs_by_category_view.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f03fed53/ambari-web/app/views/common/configs/service_configs_by_category_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/service_configs_by_category_view.js b/ambari-web/app/views/common/configs/service_configs_by_category_view.js index 7a5bcbe..d9b4409 100644 --- a/ambari-web/app/views/common/configs/service_configs_by_category_view.js +++ b/ambari-web/app/views/common/configs/service_configs_by_category_view.js @@ -655,8 +655,8 @@ App.ServiceConfigsByCategoryView = Em.View.extend(App.UserPref, App.ConfigOverri var controller = (App.router.get('currentState.name') == 'configs') ? App.router.get('mainServiceInfoConfigsController') : App.router.get('wizardStep7Controller'); - this.get('mainView').onClose(); - controller.set('filter', event.view.get('serviceConfigObj.name')); + controller.set('filter', this.get('serviceConfigObj.name')); + this.get('parentView').onClose(); } }) });