From commits-return-117205-archive-asf-public=cust-asf.ponee.io@ignite.apache.org Wed Mar 14 05:33:53 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id CDA1E18064F for ; Wed, 14 Mar 2018 05:33:52 +0100 (CET) Received: (qmail 46983 invoked by uid 500); 14 Mar 2018 04:33:51 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 46974 invoked by uid 99); 14 Mar 2018 04:33:51 -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 Mar 2018 04:33:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 98E04ED499; Wed, 14 Mar 2018 04:33:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-7459 Web Console: Hiding previous scan results on new scan. Date: Wed, 14 Mar 2018 04:33:51 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/master 536e82548 -> ae2bf3d6f IGNITE-7459 Web Console: Hiding previous scan results on new scan. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ae2bf3d6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ae2bf3d6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ae2bf3d6 Branch: refs/heads/master Commit: ae2bf3d6fc527e0f85d246abc65547d79226bf19 Parents: 536e825 Author: Alexander Kalinin Authored: Wed Mar 14 11:33:52 2018 +0700 Committer: Alexey Kuznetsov Committed: Wed Mar 14 11:33:52 2018 +0700 ---------------------------------------------------------------------- .../frontend/app/components/page-queries/controller.js | 3 +-- .../frontend/app/components/page-queries/template.tpl.pug | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ae2bf3d6/modules/web-console/frontend/app/components/page-queries/controller.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-queries/controller.js b/modules/web-console/frontend/app/components/page-queries/controller.js index 2814966..94d62b1 100644 --- a/modules/web-console/frontend/app/components/page-queries/controller.js +++ b/modules/web-console/frontend/app/components/page-queries/controller.js @@ -1570,10 +1570,9 @@ export default class { const filter = paragraph.filter; const pageSize = paragraph.pageSize; - paragraph.localQueryMode = local; - $scope.scanAvailable(paragraph) && _chooseNode(cacheName, local) .then((nid) => { + paragraph.localQueryMode = local; paragraph.scanningInProgress = true; Notebook.save($scope.notebook) http://git-wip-us.apache.org/repos/asf/ignite/blob/ae2bf3d6/modules/web-console/frontend/app/components/page-queries/template.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-queries/template.tpl.pug b/modules/web-console/frontend/app/components/page-queries/template.tpl.pug index 4419d5c..05bd09b 100644 --- a/modules/web-console/frontend/app/components/page-queries/template.tpl.pug +++ b/modules/web-console/frontend/app/components/page-queries/template.tpl.pug @@ -277,7 +277,7 @@ mixin paragraph-scan i.fa.fa-fw.fa-refresh.fa-spin(ng-show='paragraph.checkScanInProgress(true)') span.tipLabelExecute Scan on selected node - .col-sm-12.sql-result(ng-if='paragraph.queryExecuted()' ng-switch='paragraph.resultType()') + .col-sm-12.sql-result(ng-if='paragraph.queryExecuted() && !paragraph.scanningInProgress' ng-switch='paragraph.resultType()') .error(ng-switch-when='error') Error: {{paragraph.error.message}} .empty(ng-switch-when='empty') Result set is empty. Duration: #[b {{paragraph.duration | duration}}] .table(ng-switch-when='table')