Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C045D1021F for ; Mon, 2 Mar 2015 19:20:36 +0000 (UTC) Received: (qmail 51456 invoked by uid 500); 2 Mar 2015 19:20:36 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 51420 invoked by uid 500); 2 Mar 2015 19:20:36 -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 51411 invoked by uid 99); 2 Mar 2015 19:20:36 -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, 02 Mar 2015 19:20:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7125EDFD4C; Mon, 2 Mar 2015 19:20:36 +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 Date: Mon, 02 Mar 2015 19:20:37 -0000 Message-Id: <14079c0dbd4b4f34a4c5035c9949ed2e@git.apache.org> In-Reply-To: <640a05e8437d46dcbe6d65f6a85a4235@git.apache.org> References: <640a05e8437d46dcbe6d65f6a85a4235@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ambari git commit: AMBARI-9862. Keytab field is not shown correctly (alexantonenko) AMBARI-9862. Keytab field is not shown correctly (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f20500b2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f20500b2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f20500b2 Branch: refs/heads/trunk Commit: f20500b272479df261efc1b7586fb2ba4cf8ae5c Parents: 8793f44 Author: Alex Antonenko Authored: Mon Mar 2 20:09:41 2015 +0200 Committer: Alex Antonenko Committed: Mon Mar 2 21:18:25 2015 +0200 ---------------------------------------------------------------------- .../app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js | 1 + .../app/scripts/controllers/ambariViews/ViewsEditCtrl.js | 3 +++ .../main/resources/ui/admin-web/app/views/ambariViews/create.html | 2 +- .../main/resources/ui/admin-web/app/views/ambariViews/edit.html | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f20500b2/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js index 71a21a7..41d49d3 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/CreateViewInstanceCtrl.js @@ -31,6 +31,7 @@ angular.module('ambariAdminConsole') angular.forEach(parameters, function (item) { item.value = item['defaultValue']; + item.displayName = item.name.replace(/\./g, '\.\u200B'); }); $scope.instance = { http://git-wip-us.apache.org/repos/asf/ambari/blob/f20500b2/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js index 96696a0..8e720a6 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js @@ -53,6 +53,9 @@ angular.module('ambariAdminConsole') // Get META for properties View.getMeta($routeParams.viewId, $routeParams.version).then(function(data) { $scope.configurationMeta = data.data.ViewVersionInfo.parameters; + angular.forEach($scope.configurationMeta, function (item) { + item.displayName = item.name.replace(/\./g, '\.\u200B'); + }); reloadViewInfo(); }); http://git-wip-us.apache.org/repos/asf/ambari/blob/f20500b2/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html index eee6ff3..db0443f 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/create.html @@ -100,7 +100,7 @@
- +
http://git-wip-us.apache.org/repos/asf/ambari/blob/f20500b2/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html index 4d9591f..bf14adf 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html @@ -137,7 +137,7 @@
- +