From commits-return-122194-archive-asf-public=cust-asf.ponee.io@ignite.apache.org Thu Nov 29 15:03:52 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 B39E1180677 for ; Thu, 29 Nov 2018 15:03:51 +0100 (CET) Received: (qmail 65881 invoked by uid 500); 29 Nov 2018 14:03:50 -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 65872 invoked by uid 99); 29 Nov 2018 14:03:50 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Nov 2018 14:03:50 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 55421807B8; Thu, 29 Nov 2018 14:03:50 +0000 (UTC) Date: Thu, 29 Nov 2018 14:03:50 +0000 To: "commits@ignite.apache.org" Subject: [ignite-teamcity-bot] branch master updated: IGNITE-9542 Test history jumping from left to rigth in case it is not found in the DB MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154350023030.3446.13154995105677160499@gitbox.apache.org> From: dpavlov@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: ignite-teamcity-bot X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 8ebb4e9b3f1e126c88ce5131da25ccd328d6457c X-Git-Newrev: a1953b8a869ff61f816594c9bc3f6d080a4faeff X-Git-Rev: a1953b8a869ff61f816594c9bc3f6d080a4faeff X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git The following commit(s) were added to refs/heads/master by this push: new a1953b8 IGNITE-9542 Test history jumping from left to rigth in case it is not found in the DB a1953b8 is described below commit a1953b8a869ff61f816594c9bc3f6d080a4faeff Author: Dmitriy Pavlov AuthorDate: Thu Nov 29 17:03:46 2018 +0300 IGNITE-9542 Test history jumping from left to rigth in case it is not found in the DB --- .../src/main/webapp/js/testfails-2.1.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js b/ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js index eead52c..9f5dece 100644 --- a/ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js +++ b/ignite-tc-helper-web/src/main/webapp/js/testfails-2.1.js @@ -775,8 +775,12 @@ function showTestFailData(testFail, isFailureShown, settings) { } // has both base and current, draw current latest runs here. - var comparePage = isDefinedAndFilled(testFail.histCurBranch) && isDefinedAndFilled(testFail.histCurBranch.latestRuns) - && isDefinedAndFilled(testFail.histBaseBranch) && isDefinedAndFilled(testFail.histBaseBranch.latestRuns); + var comparePage = + findGetParameter('action') != null + || ( + isDefinedAndFilled(testFail.histCurBranch) && isDefinedAndFilled(testFail.histCurBranch.latestRuns) + && isDefinedAndFilled(testFail.histBaseBranch) && isDefinedAndFilled(testFail.histBaseBranch.latestRuns) + ); var baseBranchMarks = ""; @@ -810,9 +814,10 @@ function showTestFailData(testFail, isFailureShown, settings) { if (haveWeb) res += ""; - if(comparePage) - res += drawLatestRuns(testFail.histCurBranch.latestRuns); - else if(isDefinedAndFilled(testFail.histBaseBranch) && isDefinedAndFilled(testFail.histBaseBranch.latestRuns)) + if(comparePage) { + if (isDefinedAndFilled(testFail.histCurBranch)) + res += drawLatestRuns(testFail.histCurBranch.latestRuns); + } else if(isDefinedAndFilled(testFail.histBaseBranch) && isDefinedAndFilled(testFail.histBaseBranch.latestRuns)) res += drawLatestRuns(testFail.histBaseBranch.latestRuns); // has only base branch if (haveWeb) @@ -872,7 +877,7 @@ function showTestFailData(testFail, isFailureShown, settings) { histContent += ""; - if(comparePage) { + if(comparePage && isDefinedAndFilled(testFail.histBaseBranch) && isDefinedAndFilled(testFail.histBaseBranch.latestRuns)) { histContent += " " + drawLatestRuns(testFail.histBaseBranch.latestRuns); // has both base and current, draw current base runs here. } } else if (haveWeb) {