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 2018/10/10 12:17:29 UTC
[ignite-teamcity-bot] branch ignite-9800-2 updated: IGNITE-9800:
Simpler navigation implemented, builds background init from the server.
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-9800-2
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-9800-2 by this push:
new 2dded30 IGNITE-9800: Simpler navigation implemented, builds background init from the server.
2dded30 is described below
commit 2dded3056cdec90a2e7be2a0445922998bb8b10e
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Wed Oct 10 15:17:28 2018 +0300
IGNITE-9800: Simpler navigation implemented, builds background init from the server.
---
.../ignite/ci/tcbot/visa/ContributionToCheck.java | 14 +++++++++-
ignite-tc-helper-web/src/main/webapp/js/prs-1.0.js | 30 ++++------------------
2 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/ContributionToCheck.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/ContributionToCheck.java
index e627bcc..1b189ab 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/ContributionToCheck.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/ContributionToCheck.java
@@ -19,10 +19,22 @@ package org.apache.ignite.ci.tcbot.visa;
/**
*
*/
-public class ContributionToCheck {
+@SuppressWarnings("PublicField") public class ContributionToCheck {
+ /** Pr number. */
public Integer prNumber;
+
+ /** Pr title. */
public String prTitle;
+
+ /** Pr author. */
public String prAuthor;
+
+ /** Pr author avatar url. */
public String prAuthorAvatarUrl;
+
+ /** Pr html url. */
public String prHtmlUrl;
+
+ /** Branch Name for team city */
+ public String tcBranchName;
}
diff --git a/ignite-tc-helper-web/src/main/webapp/js/prs-1.0.js b/ignite-tc-helper-web/src/main/webapp/js/prs-1.0.js
index 9c5baef..dc34fb4 100644
--- a/ignite-tc-helper-web/src/main/webapp/js/prs-1.0.js
+++ b/ignite-tc-helper-web/src/main/webapp/js/prs-1.0.js
@@ -83,35 +83,15 @@ function showContributionsTable(result, srvId, suiteId) {
},
{
- "data": "prNumber",
- title: "Existing RunAll",
+ "data": "tcBranchName",
+ title: "Resolved Branch Name",
"render": function (data, type, row, meta) {
let prId = data;
- if (type === 'display') {
+ if (type === 'display' && isDefinedAndFilled(data)) {
data = "<a id='link_" + prId + "' href='" +
- prShowHref(srvId, suiteId, "pull%2F" + prId + "%2Fhead") +
+ prShowHref(srvId, suiteId, data) +
"'>" +
- "<button id='show_" + prId + "'>Open /" + data + "/head</button></a>";
-
- // todo slow service
- /*
- $.ajax({
- url: "rest/visa/findBranchForPr?serverId=" + srvId +
- "&suiteId=" + suiteId +
- "&prId=" + prId,
- success:
- function (result) {
- console.log("Contribution " + prId + " bransh: " + result + " ");
- if(isDefinedAndFilled(result.result)) {
- $('#link_' + prId).attr('href', prShowHref(srvId, suiteId, result.result));
-
- } else {
- $('#show_' + prId).attr('class', 'disabledbtn');
- }
- }
- });
- */
-
+ "<button id='show_" + prId + "'>Open " + data + "head</button></a>";
}
return data;