Skip to content

Commit 389ccec

Browse files
Add reset information retrieval and UI update for Quality Gate reset action
1 parent 79060ad commit 389ccec

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

plugin/src/main/java/io/jenkins/plugins/analysis/core/model/SummaryModel.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.kohsuke.stapler.bind.JavaScriptMethod;
1313

1414
import hudson.model.Run;
15-
import jenkins.model.Jenkins;
1615

1716
import io.jenkins.plugins.forensics.reference.ReferenceBuild;
1817
import io.jenkins.plugins.util.QualityGateStatus;
@@ -257,7 +256,6 @@ public String getResetInfo() {
257256
json.put("userName", getResetBy());
258257
json.put("userId", getResetUserId());
259258
json.put("timestamp", getResetTimestamp());
260-
json.put("rootURL", Jenkins.get().getRootUrl());
261259
}
262260

263261
return json.toString();

plugin/src/main/webapp/js/reset-quality-gate.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ const ResetQualityGateButtonHandler = function () {
1616
const resetMessage = document.createElement('li');
1717
resetMessage.className = 'jenkins-!-color-grey jenkins-!-font-style-italic';
1818

19+
const rootURL = window.location.origin + (window.location.pathname.split('/').slice(0, 2).join('/') || '');
20+
1921
let messageHTML = ' Quality gate reset by ';
2022
if (resetData.userId && resetData.userId !== 'anonymous') {
21-
messageHTML += '<a href="' + resetData.rootURL + '/user/' + resetData.userId + '">' + resetData.userName + '</a>';
23+
messageHTML += '<a href="' + rootURL + '/user/' + resetData.userId + '">' + resetData.userName + '</a>';
2224
} else {
2325
messageHTML += resetData.userName;
2426
}

0 commit comments

Comments
 (0)