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 3D2C9200B51 for ; Mon, 1 Aug 2016 14:42:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3BA36160A65; Mon, 1 Aug 2016 12:42: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 82C7E160A5D for ; Mon, 1 Aug 2016 14:42:11 +0200 (CEST) Received: (qmail 13880 invoked by uid 500); 1 Aug 2016 12:42: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 13871 invoked by uid 99); 1 Aug 2016 12:42: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; Mon, 01 Aug 2016 12:42:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8287DE058E; Mon, 1 Aug 2016 12:42:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alexantonenko@apache.org To: commits@ambari.apache.org Message-Id: <1c0b4ab8045241fb98617f7cc4ac0d6a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-17975. Property "dfs.web.authentication.kerberos.principal" is not available on configure identities page UI (alexantonenko) Date: Mon, 1 Aug 2016 12:42:10 +0000 (UTC) archived-at: Mon, 01 Aug 2016 12:42:12 -0000 Repository: ambari Updated Branches: refs/heads/trunk 24dcece8e -> 730e9379d AMBARI-17975. Property "dfs.web.authentication.kerberos.principal" is not available on configure identities page UI (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/730e9379 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/730e9379 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/730e9379 Branch: refs/heads/trunk Commit: 730e9379d701029796b16faaba959fc130a4e4f3 Parents: 24dcece Author: Alex Antonenko Authored: Mon Aug 1 15:26:21 2016 +0300 Committer: Alex Antonenko Committed: Mon Aug 1 15:42:06 2016 +0300 ---------------------------------------------------------------------- .../main/admin/kerberos/step4_controller.js | 1 + .../main/admin/kerberos/step4_controller_test.js | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/730e9379/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 6167ef2..91a40dd 100644 --- a/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js +++ b/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js @@ -239,6 +239,7 @@ App.KerberosWizardStep4Controller = App.WizardStep7Controller.extend(App.AddSecu var observedValue = Em.get(allConfigs.findProperty('name', property.get('observesValueFrom')), 'value'); property.set('value', observedValue); property.set('recommendedValue', observedValue); + property.set('isVisible', true); } if (property.get('serviceName') === 'Cluster') { property.set('category', 'Global'); http://git-wip-us.apache.org/repos/asf/ambari/blob/730e9379/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js b/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js index 8bd2d1e..1713e9c 100644 --- a/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js +++ b/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js @@ -94,7 +94,9 @@ describe('App.KerberosWizardStep4Controller', function() { Em.Object.create({ name: 'falcon_keytab', value: 'falcon_keytab_value', serviceName: 'FALCON' }), Em.Object.create({ name: 'mapreduce_keytab', value: 'mapreduce_keytab_value', serviceName: 'MAPREDUCE2' }), Em.Object.create({ name: 'hdfs_principal', value: 'hdfs_principal_value', identityType: 'user', serviceName: 'HDFS' }), - Em.Object.create({ name: 'hadoop.security.auth_to_local', serviceName: 'HDFS' }) + Em.Object.create({ name: 'hadoop.security.auth_to_local', serviceName: 'HDFS' }), + App.ServiceConfigProperty.create({ name: 'null_value', serviceName: 'HDFS', value: null, isVisible: true }), + App.ServiceConfigProperty.create({ name: 'null_value_observed_value_ok', serviceName: 'HDFS', value: null, isVisible: false, observesValueFrom: 'spnego_keytab' }) ]); var propertyValidationCases = [ @@ -125,6 +127,18 @@ describe('App.KerberosWizardStep4Controller', function() { e: [ { key: 'displayType', value: 'multiLine' } ] + }, + { + property: 'null_value', + e: [ + { key: 'isVisible', value: false } + ] + }, + { + property: 'null_value_observed_value_ok', + e: [ + { key: 'isVisible', value: true } + ] } ];