p85947160
/
Gitee-Jenkins-Plugin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert the MR id to a String so MessageFormat won't format it like a number (Fixes #429)

This commit is contained in:
Robin Müller 2016-12-05 21:11:39 +01:00
parent 3ea5fad7c5
commit 799df9e8cc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/dabsquared/gitlabjenkins/cause/CauseData.java
View File

@ -348,11 +348,11 @@ public final class CauseData {
String getShortDescription(CauseData data) {
String forkNamespace = StringUtils.equals(data.getSourceNamespace(), data.getTargetBranch()) ? "" : data.getSourceNamespace() + "/";
if (Jenkins.getActiveInstance().getMarkupFormatter() instanceof EscapedMarkupFormatter || data.getTargetProjectUrl() == null) {
return Messages.GitLabWebHookCause_ShortDescription_MergeRequestHook_plain(data.getMergeRequestIid(),
return Messages.GitLabWebHookCause_ShortDescription_MergeRequestHook_plain(String.valueOf(data.getMergeRequestIid()),
forkNamespace + data.getSourceBranch(),
data.getTargetBranch());
} else {
return Messages.GitLabWebHookCause_ShortDescription_MergeRequestHook_html(data.getMergeRequestIid(),
return Messages.GitLabWebHookCause_ShortDescription_MergeRequestHook_html(String.valueOf(data.getMergeRequestIid()),
forkNamespace + data.getSourceBranch(),
data.getTargetBranch(),
data.getTargetProjectUrl());
@ -365,12 +365,12 @@ public final class CauseData {
String forkNamespace = StringUtils.equals(data.getSourceNamespace(), data.getTargetBranch()) ? "" : data.getSourceNamespace() + "/";
if (Jenkins.getActiveInstance().getMarkupFormatter() instanceof EscapedMarkupFormatter || data.getTargetProjectUrl() == null) {
return Messages.GitLabWebHookCause_ShortDescription_NoteHook_plain(triggeredBy,
data.getMergeRequestIid(),
String.valueOf(data.getMergeRequestIid()),
forkNamespace + data.getSourceBranch(),
data.getTargetBranch());
} else {
return Messages.GitLabWebHookCause_ShortDescription_NoteHook_html(triggeredBy,
data.getMergeRequestIid(),
String.valueOf(data.getMergeRequestIid()),
forkNamespace + data.getSourceBranch(),
data.getTargetBranch(),
data.getTargetProjectUrl());