Return-Path: X-Original-To: apmail-flink-commits-archive@minotaur.apache.org Delivered-To: apmail-flink-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 5249710FAF for ; Thu, 17 Sep 2015 18:19:35 +0000 (UTC) Received: (qmail 18906 invoked by uid 500); 17 Sep 2015 18:19:35 -0000 Delivered-To: apmail-flink-commits-archive@flink.apache.org Received: (qmail 18835 invoked by uid 500); 17 Sep 2015 18:19:35 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 17477 invoked by uid 99); 17 Sep 2015 18:19:34 -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; Thu, 17 Sep 2015 18:19:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 68E77E10A7; Thu, 17 Sep 2015 18:19:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sewen@apache.org To: commits@flink.apache.org Date: Thu, 17 Sep 2015 18:20:16 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [44/51] [abbrv] flink git commit: [FLINK-2357] [web dashboard] Added status counts for a job [FLINK-2357] [web dashboard] Added status counts for a job Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7138cd55 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7138cd55 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7138cd55 Branch: refs/heads/master Commit: 7138cd55f6e4ad124245bbc3b5f6dc508be54ea2 Parents: 749c0df Author: Piotr Godek Authored: Thu Aug 27 21:56:21 2015 +0200 Committer: Stephan Ewen Committed: Thu Sep 17 14:21:52 2015 +0200 ---------------------------------------------------------------------- flink-runtime-web/web-dashboard/app/partials/jobs/job.jade | 5 +++-- flink-runtime-web/web-dashboard/web/partials/jobs/job.html | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/7138cd55/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade ---------------------------------------------------------------------- diff --git a/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade b/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade index 083e921..b264c72 100644 --- a/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade +++ b/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade @@ -28,7 +28,7 @@ nav.navbar.navbar-default.navbar-fixed-top.navbar-main(ng-if="job") .navbar-info.first.last .label-group - bs-label(status="{{status}}" ng-repeat="(status, value) in job.tasks") {{value}} + bs-label(status="{{status}}" ng-repeat="(status, value) in job['status-counts']") {{value}} .navbar-info.first.last.hidden-xs.hidden-sm | {{ job['start-time'] | amDateFormat:'YYYY-MM-DD, H:mm:ss' }} @@ -47,7 +47,8 @@ nav.navbar.navbar-default.navbar-fixed-top.navbar-main-additional(ng-if="job") li(ui-sref-active='active') a(ui-sref=".statistics") Job Accumulators / Statistics - li(ui-sref-active='active' ng-if="job['end-time'] > -1") + //- li(ui-sref-active='active' ng-if="job['end-time'] > -1") + li(ui-sref-active='active') a(ui-sref=".timeline") Timeline li(ui-sref-active='active') http://git-wip-us.apache.org/repos/asf/flink/blob/7138cd55/flink-runtime-web/web-dashboard/web/partials/jobs/job.html ---------------------------------------------------------------------- diff --git a/flink-runtime-web/web-dashboard/web/partials/jobs/job.html b/flink-runtime-web/web-dashboard/web/partials/jobs/job.html index 3f09b53..ed10feb 100644 --- a/flink-runtime-web/web-dashboard/web/partials/jobs/job.html +++ b/flink-runtime-web/web-dashboard/web/partials/jobs/job.html @@ -25,7 +25,7 @@ limitations under the License.
- {{value}} + {{value}}