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 1016E2009C5 for ; Mon, 16 May 2016 11:36:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0E9D1160A16; Mon, 16 May 2016 09:36:01 +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 56A7D1609B0 for ; Mon, 16 May 2016 11:36:00 +0200 (CEST) Received: (qmail 44089 invoked by uid 500); 16 May 2016 09:35:59 -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 44080 invoked by uid 99); 16 May 2016 09:35:59 -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; Mon, 16 May 2016 09:35:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 67B00DFC4F; Mon, 16 May 2016 09:35:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: atkach@apache.org To: commits@ambari.apache.org Message-Id: <8d25042a2ade44d29da8ffffcf962584@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-16660 Kerberos Configs Page issues. (atkach) Date: Mon, 16 May 2016 09:35:59 +0000 (UTC) archived-at: Mon, 16 May 2016 09:36:01 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.4 7f333cc02 -> 93b4b6e3e AMBARI-16660 Kerberos Configs Page issues. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/93b4b6e3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/93b4b6e3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/93b4b6e3 Branch: refs/heads/branch-2.4 Commit: 93b4b6e3ef7a87f67b92505acbf558744fceb141 Parents: 7f333cc Author: Andrii Tkach Authored: Fri May 13 17:45:40 2016 +0300 Committer: Andrii Tkach Committed: Mon May 16 12:10:02 2016 +0300 ---------------------------------------------------------------------- .../app/controllers/main/admin/kerberos.js | 29 ++++++++++++++++++++ .../main/admin/kerberos/step4_controller.js | 1 + 2 files changed, 30 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/93b4b6e3/ambari-web/app/controllers/main/admin/kerberos.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/kerberos.js b/ambari-web/app/controllers/main/admin/kerberos.js index 2db825a..a8383cc 100644 --- a/ambari-web/app/controllers/main/admin/kerberos.js +++ b/ambari-web/app/controllers/main/admin/kerberos.js @@ -22,11 +22,40 @@ require('controllers/main/admin/kerberos/step4_controller'); App.MainAdminKerberosController = App.KerberosWizardStep4Controller.extend({ name: 'mainAdminKerberosController', + + /** + * @type {boolean} + * @deafult false + */ securityEnabled: false, + + /** + * @type {boolean} + * @default false + */ defaultKerberosLoaded: false, + + /** + * @type {boolean} + * @default false + */ dataIsLoaded: false, + + /** + * @type {boolean} + * @default true + */ isRecommendedLoaded: true, + + /** + * @type {boolean} + * @default false + */ isEditMode: false, + + /** + * @type {string} + */ kdc_type: '', kdcTypesValues: { http://git-wip-us.apache.org/repos/asf/ambari/blob/93b4b6e3/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js index d7877cf..1e165ab 100644 --- a/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js +++ b/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js @@ -187,6 +187,7 @@ App.KerberosWizardStep4Controller = App.WizardStep7Controller.extend(App.AddSecu configProperties = App.config.sortConfigs(configProperties); var stepConfigs = this.createServiceConfig(configProperties); this.set('selectedService', stepConfigs[0]); + this.get('stepConfigs').pushObjects(stepConfigs); return stepConfigs; },