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 D6A8B200CA7 for ; Wed, 14 Jun 2017 09:27:47 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D56B8160BCB; Wed, 14 Jun 2017 07:27:47 +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 2A6C3160BDB for ; Wed, 14 Jun 2017 09:27:47 +0200 (CEST) Received: (qmail 33762 invoked by uid 500); 14 Jun 2017 07:27:46 -0000 Mailing-List: contact commits-help@eagle.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@eagle.apache.org Delivered-To: mailing list commits@eagle.apache.org Received: (qmail 33746 invoked by uid 99); 14 Jun 2017 07:27:46 -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; Wed, 14 Jun 2017 07:27:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9E705E0230; Wed, 14 Jun 2017 07:27:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jilin@apache.org To: commits@eagle.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: eagle git commit: [EAGLE-1042] support preview chart title Date: Wed, 14 Jun 2017 07:27:45 +0000 (UTC) archived-at: Wed, 14 Jun 2017 07:27:48 -0000 Repository: eagle Updated Branches: refs/heads/master e963abeda -> f7994cd2f [EAGLE-1042] support preview chart title https://issues.apache.org/jira/browse/EAGLE-1042 For metric preview page. There should be display the title of the chart for quick snapshot Author: zombieJ Closes #948 from zombieJ/EAGLE-1042. Project: http://git-wip-us.apache.org/repos/asf/eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/f7994cd2 Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/f7994cd2 Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/f7994cd2 Branch: refs/heads/master Commit: f7994cd2f586ebba3fa3005783c3911f929b3fb8 Parents: e963abe Author: zombieJ Authored: Wed Jun 14 15:26:59 2017 +0800 Committer: zombieJ Committed: Wed Jun 14 15:26:59 2017 +0800 ---------------------------------------------------------------------- .../src/main/webapp/app/dev/partials/metric/preview.html | 1 + .../src/main/webapp/app/dev/public/js/ctrls/metricCtrl.js | 4 ++++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/eagle/blob/f7994cd2/eagle-server/src/main/webapp/app/dev/partials/metric/preview.html ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/webapp/app/dev/partials/metric/preview.html b/eagle-server/src/main/webapp/app/dev/partials/metric/preview.html index 0c16ec0..0410dba 100644 --- a/eagle-server/src/main/webapp/app/dev/partials/metric/preview.html +++ b/eagle-server/src/main/webapp/app/dev/partials/metric/preview.html @@ -61,6 +61,7 @@

Preview

+

{{currentMetricName}}

http://git-wip-us.apache.org/repos/asf/eagle/blob/f7994cd2/eagle-server/src/main/webapp/app/dev/public/js/ctrls/metricCtrl.js ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/metricCtrl.js b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/metricCtrl.js index e0f0f15..8edd8fd 100644 --- a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/metricCtrl.js +++ b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/metricCtrl.js @@ -35,6 +35,8 @@ $scope.groups = $wrapState.param.groups; $scope.fields = $wrapState.param.fields; + $scope.currentMetricName = ''; + $scope.commonOption = {}; $scope.metricList = [$scope.metricName]; @@ -50,6 +52,8 @@ }); $scope.loadSeries = function() { + $scope.currentMetricName = $scope.metricName; + $scope.series = CompatibleEntity.timeSeries({ condition: { site: $scope.site }, groups: $scope.groups,