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 02EB0115E7 for ; Thu, 11 Sep 2014 19:02:23 +0000 (UTC) Received: (qmail 57068 invoked by uid 500); 11 Sep 2014 19:02:22 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 56981 invoked by uid 500); 11 Sep 2014 19:02:22 -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 56846 invoked by uid 99); 11 Sep 2014 19:02:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Sep 2014 19:02:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 574A69BD394; Thu, 11 Sep 2014 19:02:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jonathanhurley@apache.org To: commits@ambari.apache.org Date: Thu, 11 Sep 2014 19:02:25 -0000 Message-Id: <5f6698ec282e4f6c81b01b19c61ae4d6@git.apache.org> In-Reply-To: <5caba8d7c69a445483c0eeb878575035@git.apache.org> References: <5caba8d7c69a445483c0eeb878575035@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/26] git commit: AMBARI-7243. Admin View: no way to link to instance if you create w/o a label via API. (akovalenko) AMBARI-7243. Admin View: no way to link to instance if you create w/o a label via API. (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3f9d5a53 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3f9d5a53 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3f9d5a53 Branch: refs/heads/branch-alerts-dev Commit: 3f9d5a53f31f2bab0907f0c88cf5fdb1b5e8d5d6 Parents: dcc00b6 Author: Aleksandr Kovalenko Authored: Wed Sep 10 19:02:57 2014 +0300 Committer: Aleksandr Kovalenko Committed: Wed Sep 10 19:03:16 2014 +0300 ---------------------------------------------------------------------- .../main/resources/ui/admin-web/app/scripts/services/View.js | 6 +++--- .../ui/admin-web/app/views/ambariViews/listTable.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3f9d5a53/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/View.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/View.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/View.js index 0634a25..8f3b376 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/View.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/View.js @@ -59,9 +59,9 @@ angular.module('ambariAdminConsole') angular.forEach(item.versions, function(version) { versions[version.ViewVersionInfo.version] = version.instances.length; - angular.forEach(version.instances, function(isntance) { - isntance.label = version.ViewVersionInfo.label; - }) + angular.forEach(version.instances, function(instance) { + instance.label = instance.ViewInstanceInfo.label || version.ViewVersionInfo.label || instance.ViewInstanceInfo.view_name; + }); self.instances = self.instances.concat(version.instances); }); http://git-wip-us.apache.org/repos/asf/ambari/blob/3f9d5a53/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html index 13c6118..e27c5e5 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html @@ -54,7 +54,7 @@ - {{instance.ViewInstanceInfo.label}} + {{instance.label}} {{instance.ViewInstanceInfo.version}}
{{instance.ViewInstanceInfo.description || 'No description'}}