The Unified and Autonomous Development Platform
chore: Minor UI fix
Robin Shenecc16d6da09a
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex dc608747c7..5320b76d4f 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java@@ -59,6 +59,8 @@ import javax.inject.Inject;import javax.inject.Singleton;import java.util.*;+import static java.lang.Integer.MAX_VALUE;+@Singletonpublic class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>implements IssueChangeManager, SchedulableTask {@@ -377,8 +379,8 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>Issue.push(issue);try {for (Issue each: issueManager.query(- projectScope, query, true, 0, Integer.MAX_VALUE)) {- String message = "State changed as issue #" + issue.getNumber()+ projectScope, query, true, 0, MAX_VALUE)) {+ String message = "State changed as issue " + issue.getReference().toString(each.getProject())+ " transited to '" + issue.getState() + "'";changeState(each, transition.getToState(), new HashMap<>(),transition.getRemoveFields(), message);@@ -426,8 +428,8 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>query = new IssueQuery(Criteria.andCriterias(criterias), new ArrayList<>());Build.push(build);try {- for (Issue issue: issueManager.query(projectScope, query, true, 0, Integer.MAX_VALUE)) {- String message = "State changed as build #" + build.getNumber() + " is successful";+ for (Issue issue: issueManager.query(projectScope, query, true, 0, MAX_VALUE)) {+ String message = "State changed as build " + build.getReference().toString(issue.getProject()) + " is successful";changeState(issue, transition.getToState(), new HashMap<>(),transition.getRemoveFields(), message);}@@ -466,11 +468,11 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>query = new IssueQuery(Criteria.andCriterias(criterias), new ArrayList<>());PullRequest.push(request);try {- for (Issue issue: issueManager.query(projectScope, query, true, 0, Integer.MAX_VALUE)) {+ for (Issue issue: issueManager.query(projectScope, query, true, 0, MAX_VALUE)) {String statusName = request.getStatus().toString().toLowerCase();changeState(issue, transition.getToState(), new HashMap<>(),transition.getRemoveFields(),- "State changed as pull request #" + request.getNumber() + " is " + statusName);+ "State changed as pull request " + request.getReference().toString(issue.getProject()) + " is " + statusName);}} finally {PullRequest.pop();@@ -573,7 +575,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>});try {- for (Issue issue: issueManager.query(projectScope, query, true, 0, Integer.MAX_VALUE)) {+ for (Issue issue: issueManager.query(projectScope, query, true, 0, MAX_VALUE)) {var commit = fixedIssueIds.get(issue.getId());if (commit != null) {String commitFQN = commit.name();@@ -621,7 +623,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>query = new IssueQuery(Criteria.andCriterias(criterias), new ArrayList<>());- for (Issue issue: issueManager.query(null, query, true, 0, Integer.MAX_VALUE)) {+ for (Issue issue: issueManager.query(null, query, true, 0, MAX_VALUE)) {changeState(issue, transition.getToState(), new HashMap<>(),transition.getRemoveFields(), null);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.javaindex 9fe6ad322b..780ba06d52 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java@@ -471,7 +471,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {String title = build.getJobName();if (build.getVersion() != null)- title += " - " + build.getVersion();+ title += ": " + build.getVersion();referenceMap.put("title", title);referenceMap.put("searchKey", build.getNumber() + " " + StringUtils.deleteWhitespace(title));referenceList.add(referenceMap);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.htmlindex f6df9c7b34..584a77572c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html@@ -6,7 +6,7 @@<a wicket:id="buildStatus" class="build-status mr-3 py-2"></a><div wicket:id="blobNavigator" class="blob-navigator mr-3 py-2"></div></div>- <div wicket:id="blobOperations" class="d-flex align-items-center py-2">+ <div wicket:id="blobOperations" class="py-2"><a wicket:id="getCode" title="Code clone or download" class="mr-4 font-weight-boldest font-size-lg text-nowrap link-info"><wicket:svg href="download2" class="icon"/> Clone</a><a wicket:id="add" title="Add files to current directory" class="mr-3 text-nowrap dropdown-toggle">Add</a><a wicket:id="search" title="Search files, symbols and texts" class="mr-3 text-nowrap dropdown-toggle">Search</a>