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 06E73200BE8 for ; Fri, 9 Dec 2016 00:33:12 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 05985160B27; Thu, 8 Dec 2016 23:33:12 +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 5010D160B1F for ; Fri, 9 Dec 2016 00:33:11 +0100 (CET) Received: (qmail 65203 invoked by uid 500); 8 Dec 2016 23:33: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 65194 invoked by uid 99); 8 Dec 2016 23:33: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; Thu, 08 Dec 2016 23:33:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6F196E040F; Thu, 8 Dec 2016 23:33:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sangeetar@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-18926 - Kerberos Wizard UI creates duplicate radio buttons for FreeIPA (Jesus Alvarez via sangeetar) Date: Thu, 8 Dec 2016 23:33:10 +0000 (UTC) archived-at: Thu, 08 Dec 2016 23:33:12 -0000 Repository: ambari Updated Branches: refs/heads/trunk 647c6f27e -> da2228fb3 AMBARI-18926 - Kerberos Wizard UI creates duplicate radio buttons for FreeIPA (Jesus Alvarez via sangeetar) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/da2228fb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/da2228fb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/da2228fb Branch: refs/heads/trunk Commit: da2228fb3fe10c485ba374030eef85151cf8565d Parents: 647c6f2 Author: Sangeeta Ravindran Authored: Thu Dec 8 15:32:26 2016 -0800 Committer: Sangeeta Ravindran Committed: Thu Dec 8 15:32:40 2016 -0800 ---------------------------------------------------------------------- .../app/controllers/main/admin/kerberos/step1_controller.js | 5 +++-- .../controllers/main/admin/kerberos/step1_controller_test.js | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/da2228fb/ambari-web/app/controllers/main/admin/kerberos/step1_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/kerberos/step1_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step1_controller.js index 2feeb7f..c0decfc 100644 --- a/ambari-web/app/controllers/main/admin/kerberos/step1_controller.js +++ b/ambari-web/app/controllers/main/admin/kerberos/step1_controller.js @@ -138,8 +138,9 @@ App.KerberosWizardStep1Controller = Em.Controller.extend({ if (App.get('supports.enableIpa')) { var ipaOption = this.get('ipaOption'); var options = this.get('options'); - - options.pushObject(ipaOption); + if (options.indexOf(ipaOption) === -1){ + options.pushObject(ipaOption); + } } }, http://git-wip-us.apache.org/repos/asf/ambari/blob/da2228fb/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js b/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js index 9280367f..f3f05a4 100644 --- a/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js +++ b/ambari-web/test/controllers/main/admin/kerberos/step1_controller_test.js @@ -51,6 +51,9 @@ describe('App.KerberosWizardStep1Controller', function() { controller.loadStep(); expect(controller.get('selectedItem')).to.be.equal(Em.I18n.t('admin.kerberos.wizard.step1.option.kdc')); expect(controller.get('options')).to.not.be.empty; + controller.loadStep(); + var options = controller.get('options'); + expect(options.length == 1).to.be.true; }); it("enableIpa is false", function() {