Return-Path: X-Original-To: apmail-aurora-commits-archive@minotaur.apache.org Delivered-To: apmail-aurora-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C488010BDF for ; Sat, 5 Apr 2014 00:06:20 +0000 (UTC) Received: (qmail 87163 invoked by uid 500); 5 Apr 2014 00:05:47 -0000 Delivered-To: apmail-aurora-commits-archive@aurora.apache.org Received: (qmail 86400 invoked by uid 500); 5 Apr 2014 00:05:25 -0000 Mailing-List: contact commits-help@aurora.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aurora.incubator.apache.org Delivered-To: mailing list commits@aurora.incubator.apache.org Received: (qmail 86329 invoked by uid 99); 5 Apr 2014 00:05:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Apr 2014 00:05:24 +0000 X-ASF-Spam-Status: No, hits=-2000.5 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 05 Apr 2014 00:05:22 +0000 Received: (qmail 85371 invoked by uid 99); 5 Apr 2014 00:04:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Apr 2014 00:04:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 12715943745; Sat, 5 Apr 2014 00:04:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mansu@apache.org To: commits@aurora.incubator.apache.org Date: Sat, 05 Apr 2014 00:05:03 -0000 Message-Id: <886aa7095e824a10bdfd5e60dbb90ae7@git.apache.org> In-Reply-To: <5fdaab79d57e42c185ff60c632bdc6f2@git.apache.org> References: <5fdaab79d57e42c185ff60c632bdc6f2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/50] [abbrv] git commit: Now showing meta data and ports info. X-Virus-Checked: Checked by ClamAV on apache.org Now showing meta data and ports info. Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/9e6346b7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/9e6346b7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/9e6346b7 Branch: refs/heads/mansu/job_page Commit: 9e6346b75909625e958c493311e51f137a2ab1a4 Parents: debaa91 Author: Suman Karumuri Authored: Fri Mar 28 15:14:43 2014 -0700 Committer: Suman Karumuri Committed: Fri Mar 28 15:14:43 2014 -0700 ---------------------------------------------------------------------- .../aurora/scheduler/http/ui/js/controllers.js | 21 +++++++++++++------- .../scheduler/http/ui/schedulingDetail.html | 4 ++-- 2 files changed, 16 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/9e6346b7/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js ---------------------------------------------------------------------- diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js index 9e60286..3c28407 100644 --- a/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js +++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/js/controllers.js @@ -457,8 +457,8 @@ auroraUIControllers.controller('JobController', diskMb: task.diskMb, isService: task.isService, production: task.production, - ports: _.sortBy(task.requestedPorts), contact: task.contactEmail || '', + ports: _.sortBy(task.requestedPorts).join(', '), constraints: _.chain(task.constraints) .sortBy(function (constraint) { return constraint.name; @@ -467,10 +467,16 @@ auroraUIControllers.controller('JobController', return formatConstraint(constraint); }) .value() - .join(','), - metadata: _.sortBy(task.metadata, function (metadata) { - return metadata.key; - }) + .join(', '), + metadata: _.chain(task.metadata) + .sortBy(function (metadata) { + return metadata.key; + }) + .map(function (metadata) { + return metadata.key + ':' + metadata.value; + }) + .value() + .join(', ') }; } @@ -503,7 +509,7 @@ auroraUIControllers.controller('JobController', var limitConstraint = taskConstraint.limit ? JSON.stringify(taskConstraint.limit) : ''; - if(_.isEmpty(limitConstraint) && _.isEmpty(valueConstraint)) { + if (_.isEmpty(limitConstraint) && _.isEmpty(valueConstraint)) { return ''; } else { return constraint.name + ':' + @@ -511,4 +517,5 @@ auroraUIControllers.controller('JobController', } } } -); +) +; http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/9e6346b7/src/main/resources/org/apache/aurora/scheduler/http/ui/schedulingDetail.html ---------------------------------------------------------------------- diff --git a/src/main/resources/org/apache/aurora/scheduler/http/ui/schedulingDetail.html b/src/main/resources/org/apache/aurora/scheduler/http/ui/schedulingDetail.html index 0ce7505..c1e689f 100644 --- a/src/main/resources/org/apache/aurora/scheduler/http/ui/schedulingDetail.html +++ b/src/main/resources/org/apache/aurora/scheduler/http/ui/schedulingDetail.html @@ -11,8 +11,8 @@
  • ports : {{dataRow.schedulingDetail.ports}}
    • -
  • - packages : {{dataRow.schedulingDetail.packages}} +
  • + metadata : {{dataRow.schedulingDetail.metadata}}
  • contact : {{dataRow.schedulingDetail.contact}}