Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-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 47D3E18C93 for ; Fri, 12 Feb 2016 11:04:55 +0000 (UTC) Received: (qmail 94147 invoked by uid 500); 12 Feb 2016 11:04:55 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 94112 invoked by uid 500); 12 Feb 2016 11:04:55 -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 94103 invoked by uid 99); 12 Feb 2016 11:04:55 -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; Fri, 12 Feb 2016 11:04:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A35FDE04BE; Fri, 12 Feb 2016 11:04:54 +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 Date: Fri, 12 Feb 2016 11:04:54 -0000 Message-Id: <70d3b007b2b242ecba1c5e29b2faa514@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] ignite git commit: IGNITE-843 Fixed possible modal show. Repository: ignite Updated Branches: refs/heads/ignite-843-rc3 c680addc9 -> 3eb0be4c0 IGNITE-843 Fixed possible modal show. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/49b4b9ab Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/49b4b9ab Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/49b4b9ab Branch: refs/heads/ignite-843-rc3 Commit: 49b4b9aba9bc7241a9823dbf48977bd528647e2c Parents: c680add Author: Andrey Authored: Fri Feb 12 17:40:47 2016 +0700 Committer: Andrey Committed: Fri Feb 12 17:40:47 2016 +0700 ---------------------------------------------------------------------- .../control-center-web/src/main/js/controllers/common-module.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/49b4b9ab/modules/control-center-web/src/main/js/controllers/common-module.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index 758fab0..585cd1a 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -2121,7 +2121,7 @@ consoleModule.service('$agentDownload', [ _modal.skipSingleError = false; else if (!_modal.$isShown) { // Don't show missing node dialog on SQL demo enabling. - if (_modal.check.params && _modal.check.params.demo && timedOut) + if (_modal.check.params && _modal.check.params.demo && timedOut || !_modal.updatePromise) return; $loading.finish('loading'); @@ -2158,6 +2158,8 @@ consoleModule.service('$agentDownload', [ */ function _stopInterval() { $interval.cancel(_modal.updatePromise); + + _modal.updatePromise = null; } /**