You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/01/14 13:01:22 UTC
[ignite-teamcity-bot] branch ignite-gg-14609 updated:
IGNITE-GG-14609: UI finalization Change to tabs,
displaying all servers available
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-gg-14609
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-gg-14609 by this push:
new 3b33263 IGNITE-GG-14609: UI finalization Change to tabs, displaying all servers available
3b33263 is described below
commit 3b33263bba750da72bc045d0a9ab970055c3f542
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Mon Jan 14 16:01:18 2019 +0300
IGNITE-GG-14609: UI finalization Change to tabs, displaying all servers available
---
ignite-tc-helper-web/src/main/webapp/js/prs-1.1.js | 14 +-------------
ignite-tc-helper-web/src/main/webapp/prs.html | 7 +++++++
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/webapp/js/prs-1.1.js b/ignite-tc-helper-web/src/main/webapp/js/prs-1.1.js
index deee742..e96428c 100644
--- a/ignite-tc-helper-web/src/main/webapp/js/prs-1.1.js
+++ b/ignite-tc-helper-web/src/main/webapp/js/prs-1.1.js
@@ -18,23 +18,11 @@ function drawTable(srvId, element) {
}
function requestTableForServer(srvId, suiteIdIgnored, element) {
- // TODO multiple servers
- let s = findGetParameter("server");
- if (!isDefinedAndFilled(s)) {
- //if (srvId !== "apache")
- // return;
- }
- else if (srvId !== s)
- return;
-
- // TODO multiple suites
- // if (suiteId != "IgniteTests24Java8_RunAll")
- // return;
let tableId = "serverContributions-" + srvId;
if ($("#" + tableId).length > 0)
- return;
+ return; //protection from duplicate
drawTable(srvId, element);
diff --git a/ignite-tc-helper-web/src/main/webapp/prs.html b/ignite-tc-helper-web/src/main/webapp/prs.html
index f5126f7..ca254b2 100644
--- a/ignite-tc-helper-web/src/main/webapp/prs.html
+++ b/ignite-tc-helper-web/src/main/webapp/prs.html
@@ -51,6 +51,7 @@
showSuitesForTeamCityRunData(result);
showFormAndSuitesForPrCheck(result);
showCommentJiraForm(result);
+
const processed = new Set();
for (let chainAtServer of result) {
let serverId = chainAtServer.serverId;
@@ -60,6 +61,12 @@
processed.add(serverId);
+ let selSrv = findGetParameter("server");
+ if (isDefinedAndFilled(selSrv)) {
+ if (serverId !== selSrv)
+ continue;
+ }
+
let tabsInsertion = $("#tabs-insertionPoint");
let tabId = "tabs-" + serverId;
let tabRef = "#" + tabId;