Skip to content

The Unified and Autonomous Development Platform

Create issue upon build failure, and close created issue upon build successful.

Robin Shen329feb42b70b
diff --git a/server-core/src/main/java/io/onedev/server/cache/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/cache/DefaultCommitInfoManager.java
index 863ce4271c..2bf42fbdbf 100644
--- a/server-core/src/main/java/io/onedev/server/cache/DefaultCommitInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/cache/DefaultCommitInfoManager.java
@@ -384,7 +384,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme
commitsStore.put(txn, parentCommitKey, new ArrayByteIterable(newParentCommitBytes));
}
- for (Long issueNumber: IssueUtils.parseFixedIssues(project, nextCommit.getFullMessage())) {
+ for (Long issueNumber: IssueUtils.parseFixedIssueNumbers(nextCommit.getFullMessage())) {
ByteIterable issueKey = new LongByteIterable(issueNumber);
Collection<ObjectId> fixCommits = readCommits(fixCommitsStore, txn, issueKey);
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java
index 05647fa5d2..d3c4139d11 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java
@@ -20,6 +20,7 @@ import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.util.EditContext;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.interpolative.Segment;
+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
@@ -95,7 +96,7 @@ public class ProjectDependency implements Serializable {
private static List<InputSuggestion> suggestBuilds(String matchWith) {
Project project = getInputProject();
if (project != null)
- return SuggestionUtils.suggestBuilds(project, matchWith);
+ return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
else
return new ArrayList<>();
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
index 200484c7e7..8d96d4e875 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
@@ -314,7 +314,10 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
List<Criterion> jobCriterions = new ArrayList<>();
for (String jobName: getAccessibleJobNames(project, user).get(project))
jobCriterions.add(Restrictions.eq(BuildConstants.ATTR_JOB, jobName));
- criteria.add(Restrictions.or(jobCriterions.toArray(new Criterion[jobCriterions.size()])));
+ if (!jobCriterions.isEmpty())
+ criteria.add(Restrictions.or(jobCriterions.toArray(new Criterion[jobCriterions.size()])));
+ else
+ return builds;
}
if (term.startsWith("#"))
@@ -324,7 +327,9 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements
long buildNumber = Long.parseLong(term);
criteria.add(Restrictions.eq("number", buildNumber));
} catch (NumberFormatException e) {
- criteria.add(Restrictions.ilike("version", term, MatchMode.ANYWHERE));
+ criteria.add(Restrictions.or(
+ Restrictions.ilike("version", term, MatchMode.ANYWHERE),
+ Restrictions.ilike("jobName", term, MatchMode.ANYWHERE)));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index b46d1ffdb1..1af65b216b 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -416,7 +416,7 @@ public class Build extends AbstractEntity implements Referenceable {
RevCommit commit;
while ((commit = revWalk.next()) != null)
- fixedIssueNumbers.addAll(IssueUtils.parseFixedIssues(project, commit.getFullMessage()));
+ fixedIssueNumbers.addAll(IssueUtils.parseFixedIssueNumbers(commit.getFullMessage()));
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 846e6d9018..14668f64a1 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -32,7 +32,6 @@ import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.Version;
-import javax.validation.Valid;
import org.apache.commons.lang3.SerializationUtils;
import org.dom4j.Element;
@@ -101,7 +100,6 @@ import io.onedev.server.git.exception.ObjectNotFoundException;
import io.onedev.server.migration.VersionedDocument;
import io.onedev.server.model.Build.Status;
import io.onedev.server.model.support.BranchProtection;
-import io.onedev.server.model.support.CommitMessageTransform;
import io.onedev.server.model.support.NamedCodeCommentQuery;
import io.onedev.server.model.support.NamedCommitQuery;
import io.onedev.server.model.support.ProjectBuildSetting;
@@ -174,11 +172,6 @@ public class Project extends AbstractEntity {
@Column(length=65535)
private String description;
- @Lob
- @Column(length=65535, name="COMMIT_MSG_TRANSFORM")
- @JsonView(DefaultView.class)
- private ArrayList<CommitMessageTransform> commitMessageTransforms = new ArrayList<>();
-
/*
* Optimistic lock is necessary to ensure database integrity when update
* branch and tag protection settings upon project renaming/deletion
@@ -356,17 +349,6 @@ public class Project extends AbstractEntity {
this.ownerName = ownerName;
}
- @Editable
- @Nullable
- @Valid
- public ArrayList<CommitMessageTransform> getCommitMessageTransforms() {
- return commitMessageTransforms;
- }
-
- public void setCommitMessageTransforms(ArrayList<CommitMessageTransform> commitMessageTransforms) {
- this.commitMessageTransforms = commitMessageTransforms;
- }
-
public ArrayList<BranchProtection> getBranchProtections() {
return branchProtections;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index a084fc389a..e7cff9c02d 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -804,7 +804,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
if (fixedIssues == null) {
fixedIssues = new HashSet<>();
for (RevCommit commit: getCommits()) {
- for (Long issueNumber: IssueUtils.parseFixedIssues(getTargetProject(), commit.getFullMessage())) {
+ for (Long issueNumber: IssueUtils.parseFixedIssueNumbers(commit.getFullMessage())) {
Issue issue = OneDev.getInstance(IssueManager.class).find(getTargetProject(), issueNumber);
if (issue != null)
fixedIssues.add(issue);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java
index 24361f4a76..22a55f386b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java
@@ -92,7 +92,7 @@ public class FixedBetweenCriteria extends IssueCriteria {
RevCommit commit;
while ((commit = revWalk.next()) != null)
- fixedIssueNumbers.addAll(IssueUtils.parseFixedIssues(project, commit.getFullMessage()));
+ fixedIssueNumbers.addAll(IssueUtils.parseFixedIssueNumbers(commit.getFullMessage()));
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -124,7 +124,7 @@ public class FixedBetweenCriteria extends IssueCriteria {
RevCommit commit;
while ((commit = revWalk.next()) != null) {
- if (IssueUtils.parseFixedIssues(project, commit.getFullMessage()).contains(issue.getNumber()))
+ if (IssueUtils.parseFixedIssueNumbers(commit.getFullMessage()).contains(issue.getNumber()))
return true;
}
return false;
diff --git a/server-core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java b/server-core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java
deleted file mode 100644
index dea0ad096c..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package io.onedev.server.util;
-
-import java.util.Collection;
-import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Element;
-import org.jsoup.nodes.Node;
-import org.jsoup.nodes.TextNode;
-import org.jsoup.parser.Tag;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.unbescape.html.HtmlEscape;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.IssueManager;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.entitymanager.PullRequestManager;
-import io.onedev.server.model.AbstractEntity;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.support.CommitMessageTransform;
-import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
-
-public class CommitMessageTransformer implements Function<String, String> {
-
- private static final Logger logger = LoggerFactory.getLogger(CommitMessageTransformer.class);
-
- private static final Pattern PULL_REQUEST_PATTERN = Pattern.compile("(.*pull\\s*request\\s+)([\\w\\.-]*)#(\\d+)(?=$|\\W+?)");
-
- private static final Pattern ISSUE_PATTERN = Pattern.compile("(^|\\W+)([\\w\\.-]*)#(\\d+)(?=$|\\W+?)");
-
- private final Project project;
-
- private final String commitUrl;
-
- public CommitMessageTransformer(Project project, @Nullable String commitUrl) {
- this.project = project;
- this.commitUrl = commitUrl;
- }
-
- public static String transform(String commitMessage, Collection<CommitMessageTransform> transforms) {
- commitMessage = HtmlEscape.escapeHtml5(commitMessage);
- try {
- for (CommitMessageTransform transform: transforms)
- commitMessage = commitMessage.replaceAll(transform.getSearchFor(), transform.getReplaceWith());
- } catch (Exception e) {
- logger.error("Error transforming commit message", e);
- }
- return commitMessage;
- }
-
- @Override
- public String apply(String commitMessage) {
- commitMessage = transform(commitMessage, project.getCommitMessageTransforms());
-
- commitMessage = linkEntities(project, commitMessage, new EntityInfoProvider() {
-
- @Override
- public AbstractEntity find(Project project, long entityNumber) {
- return OneDev.getInstance(PullRequestManager.class).find(project, entityNumber);
- }
-
- @Override
- public String getUrl(Project project, AbstractEntity entity) {
- PageParameters params = PullRequestActivitiesPage.paramsOf((PullRequest)entity, null);
- return RequestCycle.get().urlFor(PullRequestActivitiesPage.class, params).toString();
- }
-
- @Override
- public Pattern getPattern() {
- return PULL_REQUEST_PATTERN;
- }
-
- });
-
- commitMessage = linkEntities(project, commitMessage, new EntityInfoProvider() {
-
- @Override
- public AbstractEntity find(Project project, long entityNumber) {
- return OneDev.getInstance(IssueManager.class).find(project, entityNumber);
- }
-
- @Override
- public String getUrl(Project project, AbstractEntity entity) {
- PageParameters params = IssueActivitiesPage.paramsOf((Issue)entity, null);
- return RequestCycle.get().urlFor(IssueActivitiesPage.class, params).toString();
- }
-
- @Override
- public Pattern getPattern() {
- return ISSUE_PATTERN;
- }
-
- });
-
- if (commitUrl != null) {
- Element body = Jsoup.parseBodyFragment(commitMessage).body();
- for (int i=0; i<body.childNodeSize(); i++) {
- if (body.childNode(i) instanceof TextNode) {
- TextNode textNode = (TextNode) body.childNode(i);
- Element element = new Element(Tag.valueOf("a"), "");
- element.addClass("commit");
- element.attr("href", commitUrl);
- element.appendText(textNode.getWholeText());
- textNode.replaceWith(element);
- }
- }
- return body.html();
- } else {
- return commitMessage;
- }
- }
-
- private String linkEntities(Project project, String commitMessage, EntityInfoProvider entityInfoProvider) {
- Element body = Jsoup.parseBodyFragment(commitMessage).body();
- ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
- StringBuffer html = new StringBuffer();
- for (int i=0; i<body.childNodeSize(); i++) {
- Node node = body.childNode(i);
- if (node instanceof TextNode) {
- TextNode textNode = (TextNode) body.childNode(i);
- Matcher matcher = entityInfoProvider.getPattern().matcher(textNode.getWholeText());
- StringBuffer buffer = new StringBuffer();
- while (matcher.find()) {
- String referencedProjectName = matcher.group(2);
- if (referencedProjectName.length() != 0) {
- Project referencedProject = projectManager.find(referencedProjectName);
- if (referencedProject == null) {
- matcher.appendReplacement(buffer, matcher.group());
- } else {
- AbstractEntity entity = entityInfoProvider.find(referencedProject, Long.parseLong(matcher.group(3)));
- if (entity != null) {
- String link = String.format("<a href=\"%s\">%s#%s</a>", entityInfoProvider.getUrl(referencedProject, entity), referencedProjectName, matcher.group(3));
- matcher.appendReplacement(buffer, matcher.group(1) + link);
- } else {
- matcher.appendReplacement(buffer, matcher.group());
- }
- }
- } else {
- AbstractEntity entity = entityInfoProvider.find(project, Long.parseLong(matcher.group(3)));
- if (entity != null) {
- String link = String.format("<a href=\"%s\">#%s</a>", entityInfoProvider.getUrl(project, entity), matcher.group(3));
- matcher.appendReplacement(buffer, matcher.group(1) + link);
- } else {
- matcher.appendReplacement(buffer, matcher.group());
- }
- }
- }
- matcher.appendTail(buffer);
- html.append(buffer);
- } else {
- html.append(node.toString());
- }
- }
- return html.toString();
- }
-
- private static interface EntityInfoProvider {
-
- Pattern getPattern();
-
- @Nullable
- AbstractEntity find(Project project, long entityNumber);
-
- String getUrl(Project project, AbstractEntity entity);
-
- }
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java b/server-core/src/main/java/io/onedev/server/util/IssueUtils.java
index 361ee65a9d..ee20b9867d 100644
--- a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/IssueUtils.java
@@ -6,19 +6,14 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import javax.annotation.Nullable;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Element;
-import org.jsoup.nodes.Node;
-import org.jsoup.nodes.TextNode;
-
-import com.google.common.base.Splitter;
-import com.google.common.collect.Sets;
+import com.google.common.collect.Lists;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -30,7 +25,17 @@ import io.onedev.server.web.editable.PropertyDescriptor;
public class IssueUtils {
- private static final Set<String> FIX_ISSUE_WORDS = Sets.newHashSet("fix", "fixed", "fixes", "resolve", "resolved", "resolves");
+ private static final List<String> ISSUE_FIX_WORDS = Lists.newArrayList(
+ "fix", "fixed", "fixes", "fixing", "resolve", "resolved", "resolves", "resolving");
+
+ private static final Pattern ISSUE_FIX_PATTERN;
+
+ static {
+ StringBuilder builder = new StringBuilder("(^|\\W+)(");
+ builder.append(StringUtils.join(ISSUE_FIX_WORDS, "|"));
+ builder.append(")\\s+issue\\s+#(\\d+)(?=$|\\W+)");
+ ISSUE_FIX_PATTERN = Pattern.compile(builder.toString());
+ }
private static final String FIELD_BEAN_PREFIX = "IssueFieldBean";
@@ -92,77 +97,28 @@ public class IssueUtils {
}
}
- public static Collection<Long> parseFixedIssues(Project project, String commitMessage) {
+ public static Collection<Long> parseFixedIssueNumbers(String commitMessage) {
Collection<Long> issueNumbers = new HashSet<>();
// Skip unmatched commit message quickly
- boolean found = false;
+ boolean fixWordsFound = false;
String lowerCaseCommitMessage = commitMessage.toLowerCase();
- for (String word: FIX_ISSUE_WORDS) {
+ for (String word: ISSUE_FIX_WORDS) {
if (lowerCaseCommitMessage.indexOf(word) != -1) {
- found = true;
+ fixWordsFound = true;
break;
}
}
- if (found) {
- /*
- * Transform commit message with defined transformers first in order not to process issue keys pointing
- * to external issue trackers
- */
- commitMessage = CommitMessageTransformer.transform(commitMessage, project.getCommitMessageTransforms());
-
- // Only process top level text node to skip transformed links above
- Element body = Jsoup.parseBodyFragment(commitMessage).body();
- for (int i=0; i<body.childNodeSize(); i++) {
- Node node = body.childNode(i);
- if (node instanceof TextNode) {
- TextNode textNode = (TextNode) body.childNode(i);
- StringTokenizer tokenizer = new StringTokenizer(textNode.getWholeText());
- while (tokenizer.hasMoreTokens()) {
- String token = tokenizer.nextToken();
- if (FIX_ISSUE_WORDS.contains(token.toLowerCase())) {
- while (FIX_ISSUE_WORDS.contains(parseIssueNumbers(tokenizer, issueNumbers)))
- parseIssueNumbers(tokenizer, issueNumbers);
- }
- }
- }
- }
+ if (fixWordsFound
+ && lowerCaseCommitMessage.contains("#")
+ && lowerCaseCommitMessage.contains("issue")) {
+ Matcher matcher = ISSUE_FIX_PATTERN.matcher(lowerCaseCommitMessage);
+ while (matcher.find())
+ issueNumbers.add(Long.parseLong(matcher.group(3)));
}
return issueNumbers;
}
- private static String parseIssueNumbers(StringTokenizer tokenizer, Collection<Long> issueNumbers) {
- boolean issuesFound = false;
- while (tokenizer.hasMoreTokens()) {
- String token = tokenizer.nextToken();
- if (token.startsWith("#")) {
- for (String field: Splitter.on(",").omitEmptyStrings().split(token)) {
- if (field.startsWith("#")) {
- field = field.substring(1);
- int index = 0;
- for (char ch: field.toCharArray()) {
- if (Character.isDigit(ch))
- index++;
- else
- break;
- }
- String digits = field.substring(0, index);
- if (digits.length() != 0) {
- issueNumbers.add(Long.parseLong(digits));
- issuesFound = true;
- if (index == field.length())
- continue;
- }
- }
- return null;
- }
- } else if (!issuesFound || !token.toLowerCase().equals("and") && !token.equals(",")) {
- return token;
- }
- }
- return null;
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java
index 01d87b0b50..69af95466a 100644
--- a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java
@@ -208,49 +208,49 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
public static boolean canModifyOrDelete(CodeComment comment) {
User user = SecurityUtils.getUser();
return user != null && user.equals(comment.getUser())
- || canWriteCode(comment.getProject());
+ || canManage(comment.getProject());
}
public static boolean canModifyOrDelete(CodeCommentReply reply) {
User user = SecurityUtils.getUser();
return user != null && user.equals(reply.getUser())
- || canWriteCode(reply.getComment().getProject());
+ || canManage(reply.getComment().getProject());
}
public static boolean canModifyOrDelete(PullRequestComment comment) {
User user = SecurityUtils.getUser();
return user != null && user.equals(comment.getUser())
- || canWriteCode(comment.getRequest().getTargetProject());
+ || canManage(comment.getRequest().getTargetProject());
}
public static boolean canModifyOrDelete(IssueComment comment) {
User user = SecurityUtils.getUser();
return user != null && user.equals(comment.getUser())
- || canWriteCode(comment.getIssue().getProject());
+ || canManageIssues(comment.getIssue().getProject());
}
public static boolean canModifyOrDelete(PullRequestChange change) {
User user = SecurityUtils.getUser();
return user != null && user.equals(change.getUser())
- || canWriteCode(change.getRequest().getTargetProject());
+ || canManage(change.getRequest().getTargetProject());
}
public static boolean canModifyOrDelete(IssueChange change) {
User user = SecurityUtils.getUser();
return user != null && user.equals(change.getUser())
- || canWriteCode(change.getIssue().getProject());
+ || canManageIssues(change.getIssue().getProject());
}
public static boolean canModify(PullRequest request) {
User user = SecurityUtils.getUser();
return user != null && user.equals(request.getSubmitter())
- || canWriteCode(request.getTargetProject());
+ || canManage(request.getTargetProject());
}
public static boolean canModify(Issue issue) {
User user = SecurityUtils.getUser();
return user != null && user.equals(issue.getSubmitter())
- || canWriteCode(issue.getProject());
+ || canManageIssues(issue.getProject());
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java
index 36271a5692..09c162163b 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java
@@ -1,19 +1,31 @@
package io.onedev.server.util.markdown;
+import javax.annotation.Nullable;
+
import org.apache.wicket.request.cycle.RequestCycle;
import org.jsoup.nodes.Document;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;
public class BuildProcessor extends BuildParser implements MarkdownProcessor {
@Override
- public void process(Project project, Document document, Object context) {
+ public void process(@Nullable Project project, Document document, Object context) {
parseReferences(project, document);
}
+ @Override
+ protected Build findReferenceable(Project project, long number) {
+ Build build = super.findReferenceable(project, number);
+ if (build != null && SecurityUtils.canAccess(build))
+ return build;
+ else
+ return null;
+ }
+
@Override
protected String toHtml(Build build, String text) {
CharSequence url = RequestCycle.get().urlFor(
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/CommitProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/CommitProcessor.java
index fa3e585597..4f1b7f5633 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/CommitProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/CommitProcessor.java
@@ -4,6 +4,8 @@ import java.util.Collection;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.annotation.Nullable;
+
import org.apache.wicket.request.cycle.RequestCycle;
import org.eclipse.jgit.lib.ObjectId;
import org.jsoup.nodes.Document;
@@ -16,6 +18,7 @@ import io.onedev.commons.utils.HtmlUtils;
import io.onedev.commons.utils.TextNodeVisitor;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
public class CommitProcessor implements MarkdownProcessor {
@@ -32,8 +35,8 @@ public class CommitProcessor implements MarkdownProcessor {
}
@Override
- public void process(Project project, Document rendered, Object context) {
- if (project != null) {
+ public void process(@Nullable Project project, Document rendered, Object context) {
+ if (project != null && SecurityUtils.canReadCode(project)) {
TextNodeVisitor visitor = new TextNodeVisitor() {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/DefaultMarkdownManager.java b/server-core/src/main/java/io/onedev/server/util/markdown/DefaultMarkdownManager.java
index 8fe74a68f0..e743e2f3e6 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/DefaultMarkdownManager.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/DefaultMarkdownManager.java
@@ -82,7 +82,7 @@ public class DefaultMarkdownManager implements MarkdownManager {
}
@Override
- public String process(Project project, String rendered, @Nullable Object context) {
+ public String process(@Nullable Project project, String rendered, @Nullable Object context) {
Document document = HtmlUtils.clean(rendered);
for (MarkdownProcessor htmlTransformer: htmlTransformers)
htmlTransformer.process(project, document, context);
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java b/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java
index e40a3e6b8a..2bcf8894d1 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java
@@ -27,7 +27,9 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.PullRequestComment;
import io.onedev.server.model.support.issue.changedata.IssueDescriptionChangeData;
+import io.onedev.server.model.support.issue.changedata.IssueTitleChangeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestDescriptionChangeData;
+import io.onedev.server.model.support.pullrequest.changedata.PullRequestTitleChangeData;
import io.onedev.server.persistence.annotation.Transactional;
@Singleton
@@ -233,12 +235,15 @@ public class EntityReferenceManager {
@Transactional
@Listen
public void on(PullRequestOpened event) {
+ addReferenceChange(event.getRequest(), event.getRequest().getTitle());
addReferenceChange(event.getRequest(), event.getRequest().getDescription());
}
@Transactional
@Listen
public void on(PullRequestChangeEvent event) {
+ if (event.getChange().getData() instanceof PullRequestTitleChangeData)
+ addReferenceChange(event.getRequest(), event.getRequest().getTitle());
if (event.getChange().getData() instanceof PullRequestDescriptionChangeData)
addReferenceChange(event.getRequest(), event.getRequest().getDescription());
}
@@ -246,12 +251,15 @@ public class EntityReferenceManager {
@Transactional
@Listen
public void on(IssueOpened event) {
+ addReferenceChange(event.getIssue(), event.getIssue().getTitle());
addReferenceChange(event.getIssue(), event.getIssue().getDescription());
}
@Transactional
@Listen
public void on(IssueChangeEvent event) {
+ if (event.getChange().getData() instanceof IssueTitleChangeData)
+ addReferenceChange(event.getIssue(), event.getIssue().getTitle());
if (event.getChange().getData() instanceof IssueDescriptionChangeData)
addReferenceChange(event.getIssue(), event.getIssue().getDescription());
}
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.java
index bc15dd4ca2..ac761f4f84 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.java
@@ -1,19 +1,30 @@
package io.onedev.server.util.markdown;
+import javax.annotation.Nullable;
+
import org.apache.wicket.request.cycle.RequestCycle;
import org.jsoup.nodes.Document;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
public class IssueProcessor extends IssueParser implements MarkdownProcessor {
@Override
- public void process(Project project, Document document, Object context) {
+ public void process(@Nullable Project project, Document document, Object context) {
parseReferences(project, document);
}
+ @Override
+ protected Issue findReferenceable(Project project, long number) {
+ if (SecurityUtils.canAccess(project))
+ return super.findReferenceable(project, number);
+ else
+ return null;
+ }
+
@Override
protected String toHtml(Issue issue, String text) {
CharSequence url = RequestCycle.get().urlFor(
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/MarkdownProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/MarkdownProcessor.java
index a16722ee62..c98bfb9903 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/MarkdownProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/MarkdownProcessor.java
@@ -10,6 +10,6 @@ import io.onedev.server.model.Project;
@ExtensionPoint
public interface MarkdownProcessor {
- void process(Project project, Document rendered, @Nullable Object context);
+ void process(@Nullable Project project, Document rendered, @Nullable Object context);
}
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.java
index af9a7504bb..c035eb44fb 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.java
@@ -1,19 +1,30 @@
package io.onedev.server.util.markdown;
+import javax.annotation.Nullable;
+
import org.apache.wicket.request.cycle.RequestCycle;
import org.jsoup.nodes.Document;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
public class PullRequestProcessor extends PullRequestParser implements MarkdownProcessor {
@Override
- public void process(Project project, Document document, Object context) {
+ public void process(@Nullable Project project, Document document, Object context) {
parseReferences(project, document);
}
+ @Override
+ protected PullRequest findReferenceable(Project project, long number) {
+ if (SecurityUtils.canReadCode(project))
+ return super.findReferenceable(project, number);
+ else
+ return null;
+ }
+
@Override
protected String toHtml(PullRequest request, String text) {
CharSequence url = RequestCycle.get().urlFor(
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java b/server-core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java
index a31fa7902d..a59b417015 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java
@@ -25,6 +25,7 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Project;
import io.onedev.server.util.Referenceable;
+import io.onedev.server.util.validation.ProjectNameValidator;
public abstract class ReferenceParser<T extends Referenceable> {
@@ -40,13 +41,15 @@ public abstract class ReferenceParser<T extends Referenceable> {
Class<?> referenceClass = typeArguments.get(0);
referenceType = referenceClass.getSimpleName();
String[] words = StringUtils.split(WordUtils.uncamel(referenceType).toLowerCase(), " ");
- StringBuilder builder = new StringBuilder("(^|\\s+)(");
+ StringBuilder builder = new StringBuilder("(^|\\W+)(");
for (int i=0; i<words.length-1; i++)
builder.append(words[i]).append("\\s*");
- builder.append(words[words.length-1]).append("\\s+)([\\w\\.-]*)#(\\d+)($|\\s+)");
+ builder.append(words[words.length-1]).append("\\s+)(");
+ builder.append(ProjectNameValidator.PATTERN.pattern());
+ builder.append(")?#(\\d+)(?=$|\\W+)");
pattern = Pattern.compile(builder.toString(), Pattern.CASE_INSENSITIVE);
} else {
- throw new RuntimeException("Sub class of ReferenceParser must realize the type argument <T>");
+ throw new RuntimeException("Subclass of ReferenceParser must realize the type argument <T>");
}
}
@@ -77,14 +80,19 @@ public abstract class ReferenceParser<T extends Referenceable> {
for (TextNode node : visitor.getMatchedNodes()) {
Matcher matcher = pattern.matcher(node.getWholeText());
while (matcher.find()) {
+ String referenceText = matcher.group(2);
String referenceProjectName = matcher.group(3);
+ Long referenceNumber = Long.valueOf(matcher.group(5));
+
Project referenceProject;
- if (StringUtils.isNotBlank(referenceProjectName))
+ if (referenceProjectName != null) {
referenceProject = OneDev.getInstance(ProjectManager.class).find(referenceProjectName);
- else
+ referenceText += referenceProjectName;
+ } else {
referenceProject = project;
- Long referenceNumber = Long.valueOf(matcher.group(4));
- String referenceText = referenceProjectName + "#" + referenceNumber;
+ }
+ referenceText += "#" + referenceNumber;
+
String referenceTag;
if (referenceProject != null) {
T referenceable = findReferenceable(referenceProject, referenceNumber);
@@ -97,7 +105,7 @@ public abstract class ReferenceParser<T extends Referenceable> {
} else {
referenceTag = referenceText;
}
- HtmlUtils.appendReplacement(matcher, node, matcher.group(1) + matcher.group(2) + referenceTag + matcher.group(5));
+ HtmlUtils.appendReplacement(matcher, node, matcher.group(1) + referenceTag);
}
HtmlUtils.appendTail(matcher, node);
}
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java
index 5c409aec82..d298c58df9 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java
@@ -12,7 +12,7 @@ import io.onedev.server.util.validation.annotation.ProjectName;
public class ProjectNameValidator implements ConstraintValidator<ProjectName, String> {
- private static final Pattern PATTERN = Pattern.compile("[\\w-\\.]+");
+ public static final Pattern PATTERN = Pattern.compile("\\w([\\w-\\.]*\\w)?");
private boolean interpolative;
@@ -45,8 +45,10 @@ public class ProjectNameValidator implements ConstraintValidator<ProjectName, St
if (!PATTERN.matcher(value).matches()) {
constraintContext.disableDefaultConstraintViolation();
String message = this.message;
- if (message.length() == 0)
- message = "Only alphanumeric, underscore, dash, and dot are accepted";
+ if (message.length() == 0) {
+ message = "Should start and end with alphanumeric or underscore. "
+ + "Only alphanumeric, underscore, dash, and dot are allowed in the middle.";
+ }
constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
return false;
} else if (value.equals("new")) {
diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
index f2ce84e942..d6f119d9de 100644
--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
@@ -84,7 +84,6 @@ import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizat
import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;
import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;
import io.onedev.server.web.page.project.setting.build.BuildSettingPage;
-import io.onedev.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage;
import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;
import io.onedev.server.web.page.project.setting.issue.PromptFieldsUponIssueOpenSettingPage;
import io.onedev.server.web.page.project.setting.issue.StateTransitionsPage;
@@ -233,7 +232,6 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new OnePageMapper("projects/${project}/settings/issue/prompt-fields-upon-issue-open",
PromptFieldsUponIssueOpenSettingPage.class));
add(new OnePageMapper("projects/${project}/settings/build", BuildSettingPage.class));
- add(new OnePageMapper("projects/${project}/settings/commit-message-transform", CommitMessageTransformPage.class));
add(new OnePageMapper("projects/${project}/settings/web-hooks", WebHooksPage.class));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
index 6865a02235..9913a776d0 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
@@ -30,6 +30,7 @@ import io.onedev.server.util.BuildConstants;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
@SuppressWarnings("serial")
@@ -82,11 +83,11 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
if (operator == BuildQueryLexer.SubmittedBy || operator == BuildQueryLexer.CancelledBy)
return SuggestionUtils.suggestUsers(matchWith);
else if (operator == BuildQueryLexer.DependsOn || operator == BuildQueryLexer.DependenciesOf)
- return SuggestionUtils.suggestBuilds(project, matchWith);
+ return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
else if (operator == BuildQueryLexer.FixedIssue)
- return SuggestionUtils.suggestIssues(project, matchWith);
+ return SuggestionUtils.suggestIssues(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
else
- return SuggestionUtils.suggestPullRequests(project, matchWith);
+ return SuggestionUtils.suggestPullRequests(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
} else {
String fieldName = BuildQuery.getValue(fieldElements.get(0).getMatchedText());
try {
@@ -103,7 +104,7 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
else
return null;
} else if (fieldName.equals(BuildConstants.FIELD_NUMBER)) {
- return SuggestionUtils.suggestBuilds(project, matchWith);
+ return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
} else {
BuildParamManager buildParamManager = OneDev.getInstance(BuildParamManager.class);
List<String> paramValues = new ArrayList<>(buildParamManager.getBuildParamValues(fieldName));
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java
index 3507d6408d..b02a9aa332 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java
@@ -27,6 +27,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.search.commit.CommitQueryParser;
import io.onedev.server.util.Constants;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
@SuppressWarnings("serial")
@@ -67,7 +68,7 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {
case CommitQueryParser.TAG:
return SuggestionUtils.suggestTags(project, matchWith);
case CommitQueryParser.BUILD:
- return SuggestionUtils.suggestBuilds(project, matchWith);
+ return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
case CommitQueryParser.AUTHOR:
case CommitQueryParser.COMMITTER:
Map<String, LinearRange> suggestedInputs = new LinkedHashMap<>();
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
index 69491e1e48..2cf85d9aa2 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
@@ -61,6 +61,7 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
@SuppressWarnings("serial")
@@ -117,7 +118,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
case "tag":
return SuggestionUtils.suggestTags(project, matchWith);
case "build":
- return SuggestionUtils.suggestBuilds(project, matchWith);
+ return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
}
} else if ("criteriaValue".equals(spec.getLabel())) {
List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
@@ -129,7 +130,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
if (operator == SubmittedBy)
return SuggestionUtils.suggestUsers(matchWith);
else
- return SuggestionUtils.suggestBuilds(project, matchWith);
+ return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
} else {
String fieldName = getValue(fieldElements.get(0).getMatchedText());
@@ -143,11 +144,11 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
} else if (fieldSpec instanceof UserChoiceField) {
return SuggestionUtils.suggestUsers(matchWith);
} else if (fieldSpec instanceof IssueChoiceField) {
- return SuggestionUtils.suggestIssues(project, matchWith);
+ return SuggestionUtils.suggestIssues(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
} else if (fieldSpec instanceof BuildChoiceField) {
- return SuggestionUtils.suggestBuilds(project, matchWith);
+ return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
} else if (fieldSpec instanceof PullRequestChoiceField) {
- return SuggestionUtils.suggestPullRequests(project, matchWith);
+ return SuggestionUtils.suggestPullRequests(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
} else if (fieldSpec instanceof BooleanField) {
return SuggestionUtils.suggest(Lists.newArrayList("true", "false"), matchWith);
} else if (fieldSpec instanceof GroupChoiceField) {
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
index 475729230c..4a3745cab1 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
@@ -33,6 +33,7 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.PullRequestConstants;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
@SuppressWarnings("serial")
@@ -77,7 +78,7 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
int operator = PullRequestQuery.getOperator(operatorName);
if (fieldElements.isEmpty()) {
if (operator == PullRequestQueryLexer.IncludesIssue)
- return SuggestionUtils.suggestIssues(project, matchWith);
+ return SuggestionUtils.suggestIssues(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
else if (operator != PullRequestQueryLexer.IncludesCommit)
return SuggestionUtils.suggestUsers(matchWith);
else
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java
new file mode 100644
index 0000000000..6c2627afb7
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ReferenceInputBehavior.java
@@ -0,0 +1,116 @@
+package io.onedev.server.web.behavior;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import io.onedev.commons.codeassist.InputCompletion;
+import io.onedev.commons.codeassist.InputStatus;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.utils.LinearRange;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.util.validation.ProjectNameValidator;
+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
+import io.onedev.server.web.util.SuggestionUtils;
+
+public abstract class ReferenceInputBehavior extends InputAssistBehavior {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final int REFERENCE_SUGGESTION_LIMIT = 5;
+
+ private static final Pattern REFERENCE_PATTERN = Pattern.compile("(^|\\W+)((pull\\s*request|issue|build)\\s+)?(" + ProjectNameValidator.PATTERN.pattern() + ")?#(\\S*)$",
+ Pattern.CASE_INSENSITIVE);
+
+ private static final Pattern SPACE_PATTERN = Pattern.compile("\\s+");
+
+ private final boolean appendTitle;
+
+ public ReferenceInputBehavior(boolean appendTitle) {
+ super(false);
+ this.appendTitle = appendTitle;
+ }
+
+ @Override
+ protected List<InputCompletion> getSuggestions(InputStatus inputStatus) {
+ List<InputCompletion> completions = new ArrayList<>();
+ String contentBeforeCaret = inputStatus.getContentBeforeCaret();
+ Matcher matcher = REFERENCE_PATTERN.matcher(contentBeforeCaret);
+ if (matcher.find()) {
+ String matchWith = matcher.group(6);
+ String projectName = matcher.group(4);
+ Project project;
+ if (projectName != null)
+ project = OneDev.getInstance(ProjectManager.class).find(projectName);
+ else
+ project = getProject();
+ if (project != null) {
+ List<InputSuggestion> suggestions = new ArrayList<>();
+ String referenceType = matcher.group(3);
+ if (referenceType != null)
+ referenceType = SPACE_PATTERN.matcher(referenceType).replaceAll("").toLowerCase();
+ else
+ referenceType = "";
+ switch (referenceType) {
+ case "issue":
+ suggestions = SuggestionUtils.suggestIssues(project, matchWith, REFERENCE_SUGGESTION_LIMIT*3);
+ break;
+ case "build":
+ suggestions = SuggestionUtils.suggestBuilds(project, matchWith, REFERENCE_SUGGESTION_LIMIT*3);
+ break;
+ case "pullrequest":
+ suggestions = SuggestionUtils.suggestPullRequests(project, matchWith, REFERENCE_SUGGESTION_LIMIT*3);
+ break;
+ default:
+ if (projectName == null) {
+ for (InputSuggestion suggestion: SuggestionUtils.suggestIssues(project, matchWith, REFERENCE_SUGGESTION_LIMIT)) {
+ suggestions.add(new InputSuggestion("issue " + suggestion.getContent(), -1,
+ suggestion.getDescription(), null));
+ }
+ for (InputSuggestion suggestion: SuggestionUtils.suggestPullRequests(project, matchWith, REFERENCE_SUGGESTION_LIMIT)) {
+ suggestions.add(new InputSuggestion("pull request " + suggestion.getContent(), -1,
+ suggestion.getDescription(), null));
+ }
+ for (InputSuggestion suggestion: SuggestionUtils.suggestBuilds(project, matchWith, REFERENCE_SUGGESTION_LIMIT)) {
+ suggestions.add(new InputSuggestion("build " + suggestion.getContent(), -1,
+ suggestion.getDescription(), null));
+ }
+ }
+ }
+ for (InputSuggestion suggestion: suggestions) {
+ int hashIndex = matcher.start(6)-1;
+ InputCompletion completion;
+ if (appendTitle) {
+ String content = contentBeforeCaret.substring(0, hashIndex) + suggestion.getContent()
+ + ": " + suggestion.getDescription();
+ completion = new InputCompletion(suggestion.getContent(),
+ content + inputStatus.getContentAfterCaret(), content.length(),
+ suggestion.getDescription(), suggestion.getMatch());
+ } else {
+ String content = contentBeforeCaret.substring(0, hashIndex) + suggestion.getContent() + " ";
+ completion = new InputCompletion(suggestion.getContent(),
+ content + inputStatus.getContentAfterCaret(), content.length(),
+ suggestion.getDescription(), suggestion.getMatch());
+ }
+ completions.add(completion);
+ }
+ }
+ }
+ return completions;
+ }
+
+ @Override
+ protected List<LinearRange> getErrors(String inputContent) {
+ return new ArrayList<>();
+ }
+
+ @Override
+ protected int getAnchor(String inputContent) {
+ return inputContent.lastIndexOf('#');
+ }
+
+ protected abstract Project getProject();
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java
index 6e4215f771..4a1bd9c49b 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java
@@ -41,14 +41,26 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {
public static final int MAX_SUGGESTIONS = 1000;
+ private final boolean noAutoFocus;
+
private FloatingPanel dropdown;
+ public InputAssistBehavior(boolean noAutoFocus) {
+ this.noAutoFocus = noAutoFocus;
+ }
+
+ public InputAssistBehavior() {
+ this(true);
+ }
+
@Override
protected void onBind() {
super.onBind();
Component input = getComponent();
input.add(AttributeAppender.append("class", "input-assist"));
+ if (noAutoFocus)
+ input.add(AttributeAppender.append("class", "no-autofocus"));
input.setOutputMarkupId(true);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.html
index 9e31cebf7d..093666b743 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.html
@@ -1,5 +1,5 @@
<wicket:panel>
<div class="referenced-from">
- <a wicket:id="link"><span wicket:id="label"></span></a>
+ <span wicket:id="title"></span>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.java
index 154929538f..e9a2809011 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.java
@@ -1,15 +1,16 @@
package io.onedev.server.web.component.codecomment.referencedfrom;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.unbescape.html.HtmlEscape;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.model.CodeComment;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
@SuppressWarnings("serial")
@@ -31,11 +32,16 @@ public class ReferencedFromCodeCommentPanel extends GenericPanel<CodeComment> {
super.onInitialize();
CodeComment comment = getModelObject();
- PageParameters params = ProjectBlobPage.paramsOf(comment);
- Link<Void> link = new BookmarkablePageLink<Void>("link", ProjectBlobPage.class, params);
- link.add(new Label("label", comment.getMarkPos().getPath()));
- add(link);
+ if (SecurityUtils.canReadCode(comment.getProject())) {
+ PageParameters params = ProjectBlobPage.paramsOf(comment);
+ String url = RequestCycle.get().urlFor(ProjectBlobPage.class, params).toString();
+ String title = String.format("<a href='%s'>%s</a>", url,
+ HtmlEscape.escapeHtml5(comment.getMarkPos().getPath()));
+ add(new Label("title", title).setEscapeModelStrings(false));
+ } else {
+ add(new Label("title", comment.getMarkPos().getPath()));
+ }
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java
index 2e2ec0fd4e..1827137add 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java
@@ -22,8 +22,8 @@ import org.eclipse.jgit.revwalk.RevCommit;
import io.onedev.commons.utils.Highlighter;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
-import io.onedev.server.util.CommitMessageTransformer;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
+import io.onedev.server.web.util.ReferenceTransformer;
@SuppressWarnings("serial")
public abstract class CommitMessagePanel extends Panel {
@@ -52,19 +52,20 @@ public abstract class CommitMessagePanel extends Panel {
}
private String highlight(String text, @Nullable String commitUrl) {
+ ReferenceTransformer transformer = new ReferenceTransformer(getProject(), commitUrl);
+
return Highlighter.highlightPatterns(text, highlightPatternsModel.getObject(), new Function<String, String>() {
@Override
public String apply(String text) {
- String transformed = new CommitMessageTransformer(getProject(), commitUrl).apply(text);
- return "<span class='highlight'>" + transformed + "</span>";
+ return "<span class='highlight'>" + transformer.apply(text) + "</span>";
}
}, new Function<String, String>() {
@Override
public String apply(String text) {
- return new CommitMessageTransformer(getProject(), commitUrl).apply(text);
+ return transformer.apply(text);
}
});
@@ -83,10 +84,10 @@ public abstract class CommitMessagePanel extends Panel {
PageParameters params = CommitDetailPage.paramsOf(getProject(), getCommit().name());
String commitUrl = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();
- add(new Label("summary", new AbstractReadOnlyModel<String>() {
+ add(new Label("summary", new LoadableDetachableModel<String>() {
@Override
- public String getObject() {
+ protected String load() {
return highlight(getCommit().getShortMessage(), commitUrl);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/message/commit-message.css b/server-core/src/main/java/io/onedev/server/web/component/commit/message/commit-message.css
index df2be57580..b1f9d0b75e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/message/commit-message.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/message/commit-message.css
@@ -1,4 +1,4 @@
-.commit-message>.summary a.commit {
+.commit-message>.summary a {
color: #444;
}
.commit-message>.detail {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
index 6bd880cea3..30775e137b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
@@ -32,6 +32,7 @@ import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.web.behavior.ReferenceInputBehavior;
import io.onedev.server.web.component.markdown.AttachmentSupport;
import io.onedev.server.web.component.project.comment.CommentInput;
import io.onedev.server.web.component.stringchoice.StringSingleChoice;
@@ -77,6 +78,14 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
}
}));
+ titleInput.add(new ReferenceInputBehavior(false) {
+
+ @Override
+ protected Project getProject() {
+ return NewIssueEditor.this.getProject();
+ }
+
+ });
add(descriptionInput = new CommentInput("description", Model.of(""), false) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
index 21ea5063ee..a1e6bc4c8d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
@@ -25,7 +25,7 @@
</div>
<wicket:fragment wicket:id="summaryFrag">
<div class="first-line">
- <a wicket:id="title" class="title"><span wicket:id="label"></span></a>
+ <span wicket:id="title" class="title"></span>
<span wicket:id="number" class="number"></span>
<a wicket:id="copy" title="Copy issue number and title" class="copy"><i class="fa fa-copy"></i></a>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index d89346048c..3dd54badc5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -41,6 +41,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,6 +80,7 @@ import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.QueryPosition;
import io.onedev.server.web.util.QuerySaveSupport;
+import io.onedev.server.web.util.ReferenceTransformer;
@SuppressWarnings("serial")
public abstract class IssueListPanel extends Panel {
@@ -528,7 +530,6 @@ public abstract class IssueListPanel extends Panel {
IModel<Issue> rowModel) {
Issue issue = rowModel.getObject();
Fragment fragment = new Fragment(componentId, "summaryFrag", IssueListPanel.this);
- fragment.add(new Label("number", "#" + issue.getNumber()));
OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);
QueryPosition position;
if (getProject() != null) {
@@ -537,12 +538,18 @@ public abstract class IssueListPanel extends Panel {
} else {
position = null;
}
- Link<Void> link = new BookmarkablePageLink<Void>("title", IssueActivitiesPage.class,
- IssueActivitiesPage.paramsOf(issue, position));
- link.add(new Label("label", issue.getTitle()));
-
- fragment.add(link);
- fragment.add(new WebMarkupContainer("copy").add(new CopyClipboardBehavior(Model.of("#" + issue.getNumber() + ": " + issue.getTitle()))));
+
+ String url = RequestCycle.get().urlFor(IssueActivitiesPage.class,
+ IssueActivitiesPage.paramsOf(issue, position)).toString();
+
+ fragment.add(new Label("number", "<a href='" + url + "'>#" + issue.getNumber() + "</a>")
+ .setEscapeModelStrings(false));
+
+ String transformed = new ReferenceTransformer(issue.getProject(), url).apply(issue.getTitle());
+ fragment.add(new Label("title", transformed).setEscapeModelStrings(false));
+
+ fragment.add(new WebMarkupContainer("copy").add(
+ new CopyClipboardBehavior(Model.of("#" + issue.getNumber() + ": " + issue.getTitle()))));
fragment.add(new IssueStateLabel("state", rowModel));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.html
index aeda33e237..0a7210fd8b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.html
@@ -1,6 +1,6 @@
<wicket:panel>
<div class="referenced-from clearfix">
- <a wicket:id="link" class="pull-left"><span wicket:id="label"></span></a>
+ <span wicket:id="title" class="pull-left"></span>
<span wicket:id="state" class="pull-right"></span>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java
index 0aedabcd08..4bfb7b2bef 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java
@@ -1,18 +1,19 @@
package io.onedev.server.web.component.issue.referencedfrom;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.cycle.RequestCycle;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.issue.IssueStateLabel;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
+import io.onedev.server.web.util.ReferenceTransformer;
@SuppressWarnings("serial")
public class ReferencedFromIssuePanel extends GenericPanel<Issue> {
@@ -38,12 +39,28 @@ public class ReferencedFromIssuePanel extends GenericPanel<Issue> {
Issue issue = getModelObject();
- Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue, null));
- add(link);
- if (issue.getProject().equals(project)) {
- link.add(new Label("label", "#" + issue.getNumber() + " - " + issue.getTitle()));
+ if (SecurityUtils.canAccess(issue.getProject())) {
+ String url = RequestCycle.get().urlFor(IssueActivitiesPage.class,
+ IssueActivitiesPage.paramsOf(issue, null)).toString();
+ ReferenceTransformer transformer = new ReferenceTransformer(issue.getProject(), url);
+ String transformed = transformer.apply(issue.getTitle());
+ String title;
+ if (issue.getProject().equals(project)) {
+ title = String.format("<a href='%s'>#%d</a> - %s", url, issue.getNumber(), transformed);
+ } else {
+ title = String.format("<a href='%s'>%s#%d</a> - %s",
+ url, issue.getProject().getName(), issue.getNumber(), transformed);
+ }
+ add(new Label("title", title).setEscapeModelStrings(false));
} else {
- link.add(new Label("label", issue.getProject().getName() + "#" + issue.getNumber() + " - " + issue.getTitle()));
+ ReferenceTransformer transformer = new ReferenceTransformer(issue.getProject(), null);
+ String transformed = transformer.apply(issue.getTitle());
+ String title;
+ if (issue.getProject().equals(project))
+ title = "#" + issue.getNumber() + " - " + transformed;
+ else
+ title = issue.getProject().getName() + "#" + issue.getNumber() + " - " + transformed;
+ add(new Label("title", title).setEscapeModelStrings(false));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
index 4e38cd7af5..9cf41f3406 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
@@ -11,15 +11,18 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.web.behavior.ReferenceInputBehavior;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
+import io.onedev.server.web.util.ReferenceTransformer;
@SuppressWarnings("serial")
public abstract class IssueTitlePanel extends Panel {
@@ -34,6 +37,14 @@ public abstract class IssueTitlePanel extends Panel {
Fragment titleEditor = new Fragment(CONTENT_ID, "titleEditFrag", this);
Form<?> form = new Form<Void>("form");
TextField<String> titleInput = new TextField<String>("title", Model.of(getIssue().getTitle()));
+ titleInput.add(new ReferenceInputBehavior(false) {
+
+ @Override
+ protected Project getProject() {
+ return getIssue().getProject();
+ }
+
+ });
titleInput.setRequired(true);
titleInput.setLabel(Model.of("Title"));
@@ -81,14 +92,15 @@ public abstract class IssueTitlePanel extends Panel {
private Fragment newTitleViewer() {
Fragment titleViewer = new Fragment(CONTENT_ID, "titleViewFrag", this);
- titleViewer.add(new Label("title", new AbstractReadOnlyModel<String>() {
+ titleViewer.add(new Label("title", new LoadableDetachableModel<String>() {
@Override
- public String getObject() {
- return "#" + getIssue().getNumber() + " - " + getIssue().getTitle();
+ protected String load() {
+ ReferenceTransformer transformer = new ReferenceTransformer(getIssue().getProject(), null);
+ return "#" + getIssue().getNumber() + " - " + transformer.apply(getIssue().getTitle());
}
- }));
+ }).setEscapeModelStrings(false));
titleViewer.add(new AjaxLink<Void>("edit") {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html
index c0e0ec16cc..ef9b67abe6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html
@@ -18,7 +18,7 @@
<span class="separator pull-left"></span>
<a class="do-emoji pull-left" title="Show emojis"><i class="fa fa-smile-o"></i></a>
<a class="do-mention pull-left" title="Mention someone"><i class="fa fa-at"></i></a>
- <a class="do-hashtag pull-left" title="Reference pull request/issue"><i class="fa fa-hashtag"></i></a>
+ <a class="do-hashtag pull-left" title="Reference issue/build/pull request"><i class="fa fa-hashtag"></i></a>
</div>
<div class="pull-left dropdown compact-mode">
<a data-toggle="dropdown" type="button"><i class="fa fa-chevron-down"></i></a>
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.java
index 72e92b2850..7d20a6ce54 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
@@ -56,13 +56,14 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.util.markdown.MarkdownManager;
+import io.onedev.server.util.userident.UserIdent;
+import io.onedev.server.util.validation.ProjectNameValidator;
import io.onedev.server.web.avatar.AvatarManager;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.markdown.emoji.EmojiOnes;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
-import io.onedev.server.util.userident.UserIdent;
@SuppressWarnings("serial")
public class MarkdownEditor extends FormComponentPanel<String> {
@@ -313,8 +314,16 @@ public class MarkdownEditor extends FormComponentPanel<String> {
else
referenceProject = null;
if (referenceProject != null || StringUtils.isBlank(referenceProjectName)) {
+ int count;
+ if ("issue".equals(referenceQueryType)
+ || "pull request".equals(referenceQueryType)
+ || "build".equals(referenceQueryType)) {
+ count = ATWHO_LIMIT*3;
+ } else {
+ count = ATWHO_LIMIT;
+ }
if (StringUtils.isBlank(referenceQueryType) || "issue".equals(referenceQueryType)) {
- for (Issue issue: getReferenceSupport().findIssues(referenceProject, referenceQuery, ATWHO_LIMIT)) {
+ for (Issue issue: getReferenceSupport().findIssues(referenceProject, referenceQuery, count)) {
Map<String, String> referenceMap = new HashMap<>();
referenceMap.put("referenceType", "issue");
referenceMap.put("referenceNumber", String.valueOf(issue.getNumber()));
@@ -323,8 +332,8 @@ public class MarkdownEditor extends FormComponentPanel<String> {
referenceList.add(referenceMap);
}
}
- if (StringUtils.isBlank(referenceQueryType) || "pull request".equals(referenceQueryType)) {
- for (PullRequest request: getReferenceSupport().findPullRequests(referenceProject, referenceQuery, ATWHO_LIMIT)) {
+ if (StringUtils.isBlank(referenceQueryType) || "pullrequest".equals(referenceQueryType)) {
+ for (PullRequest request: getReferenceSupport().findPullRequests(referenceProject, referenceQuery, count)) {
Map<String, String> referenceMap = new HashMap<>();
referenceMap.put("referenceType", "pull request");
referenceMap.put("referenceNumber", String.valueOf(request.getNumber()));
@@ -334,14 +343,16 @@ public class MarkdownEditor extends FormComponentPanel<String> {
}
}
if (StringUtils.isBlank(referenceQueryType) || "build".equals(referenceQueryType)) {
- for (Build build: getReferenceSupport().findBuilds(referenceProject, referenceQuery, ATWHO_LIMIT)) {
+ for (Build build: getReferenceSupport().findBuilds(referenceProject, referenceQuery, count)) {
Map<String, String> referenceMap = new HashMap<>();
referenceMap.put("referenceType", "build");
referenceMap.put("referenceNumber", String.valueOf(build.getNumber()));
- String title = build.getJobName();
- if (build.getVersion() != null)
- title += " : " + build.getVersion();
+ String title;
+ if (build.getVersion() != null)
+ title = "(" + build.getVersion() + ") " + build.getJobName();
+ else
+ title = build.getJobName();
referenceMap.put("referenceTitle", title);
referenceMap.put("searchKey", build.getNumber() + " " + StringUtils.deleteWhitespace(title));
referenceList.add(referenceMap);
@@ -435,7 +446,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {
else
autosaveKey = "undefined";
- String script = String.format("onedev.server.markdown.onDomReady('%s', %s, %d, %s, %d, %b, %b, %s);",
+ String script = String.format("onedev.server.markdown.onDomReady('%s', %s, %d, %s, %d, %b, %b, '%s', %s);",
container.getMarkupId(),
callback,
ATWHO_LIMIT,
@@ -443,6 +454,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {
getAttachmentSupport()!=null?getAttachmentSupport().getAttachmentMaxSize():0,
getUserMentionSupport() != null,
getReferenceSupport() != null,
+ JavaScriptEscape.escapeJavaScript(ProjectNameValidator.PATTERN.pattern()),
autosaveKey);
response.render(OnDomReadyHeaderItem.forScript(script));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
index d49f3f30b1..23892a399d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
@@ -38,7 +38,8 @@ onedev.server.markdown = {
$preview.outerHeight($rendered.outerHeight());
},
onDomReady: function(containerId, callback, atWhoLimit, attachmentSupport,
- attachmentMaxSize, canMentionUser, canReferenceEntity, autosaveKey) {
+ attachmentMaxSize, canMentionUser, canReferenceEntity,
+ projectNamePattern, autosaveKey) {
var $container = $("#" + containerId);
var $head = $container.children(".head");
var $body = $container.children(".body");
@@ -567,30 +568,23 @@ onedev.server.markdown = {
});
}
+ var referencePattern = "(^|\\W+)(pull\\s*request|issue|build)\\s+(" + projectNamePattern + ")?#\\S*$";
+
if (canReferenceEntity) {
- function getReferencePullRequestProject() {
+ function getReferenceType() {
var input = $input.val().substring(0, $input.caret()).trim();
- var match = /.*pull\s*request\s+([\w\.-]*)#$/gi.exec(input);
- if (match)
- return match[1];
- else
+ var match = new RegExp(referencePattern, 'gi').exec(input);
+ if (match)
+ return match[2].replace(/\s+/g, '').toLowerCase();
+ else
return undefined;
}
-
- function getReferenceBuildProject() {
- var input = $input.val().substring(0, $input.caret()).trim();
- var match = /.*build\s+([\w\.-]*)#$/gi.exec(input);
- if (match)
- return match[1];
- else
- return undefined;
- }
-
- function getReferenceIssueProject() {
+
+ function getReferenceProject() {
var input = $input.val().substring(0, $input.caret()).trim();
- var match = /.*issue\s+([\w\.-]*)#$/gi.exec(input);
- if (match)
- return match[1];
+ var match = new RegExp(referencePattern, 'gi').exec(input);
+ if (match)
+ return match[3];
else
return undefined;
}
@@ -602,41 +596,26 @@ onedev.server.markdown = {
callbacks: {
remoteFilter: function(query, renderCallback) {
$container.data("atWhoReferenceRenderCallback", renderCallback);
- var queryType;
- var project = getReferencePullRequestProject();
- if (project != undefined) {
- callback("referenceQuery", query, "pull request", project);
- } else {
- project = getReferenceBuildProject();
- if (project != undefined) {
- callback("referenceQuery", query, "build", project);
- } else {
- project = getReferenceIssueProject();
- if (project != undefined)
- callback("referenceQuery", query, "issue", project);
- else if ($input.val().substring(0, $input.caret()).match(/(.*\s+|^)#/gi))
- callback("referenceQuery", query, undefined, undefined);
- }
- }
+ var referenceType = getReferenceType();
+ if (referenceType)
+ callback("referenceQuery", query, referenceType, getReferenceProject());
+ else if ($input.val().substring(0, $input.caret()).match(/(.*\W+|^)#\S*$/gi))
+ callback("referenceQuery", query, undefined, undefined);
}
},
displayTpl: function() {
- if (getReferencePullRequestProject() != undefined
- || getReferenceBuildProject() != undefined
- || getReferenceIssueProject() != undefined) {
+ var referenceType = getReferenceType();
+ if (referenceType)
return "<li><span class='text-muted'>#${referenceNumber}</span> - ${referenceTitle}</li>";
- } else {
+ else
return "<li><span class='text-muted'>${referenceType} #${referenceNumber}</span> - ${referenceTitle}</li>";
- }
},
insertTpl: function() {
- if (getReferencePullRequestProject() != undefined
- || getReferenceBuildProject() != undefined
- || getReferenceIssueProject() != undefined) {
+ var referenceType = getReferenceType();
+ if (referenceType)
return "#${referenceNumber}";
- } else {
+ else
return '${referenceType} #${referenceNumber}';
- }
},
limit: atWhoLimit
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java b/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java
index 97b1bf9ad3..a482d4571e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java
@@ -1,8 +1,11 @@
package io.onedev.server.web.component.project.comment;
+import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
+import javax.annotation.Nullable;
+
import org.apache.wicket.model.IModel;
import io.onedev.commons.utils.matchscore.MatchScoreProvider;
@@ -61,21 +64,27 @@ public abstract class CommentInput extends MarkdownEditor {
return new AtWhoReferenceSupport() {
@Override
- public List<PullRequest> findPullRequests(Project project, String query, int count) {
+ public List<PullRequest> findPullRequests(@Nullable Project project, String query, int count) {
if (project == null)
project = getProject();
- return OneDev.getInstance(PullRequestManager.class).query(project, query, count);
+ if (SecurityUtils.canReadCode(project))
+ return OneDev.getInstance(PullRequestManager.class).query(project, query, count);
+ else
+ return new ArrayList<>();
}
@Override
- public List<Issue> findIssues(Project project, String query, int count) {
+ public List<Issue> findIssues(@Nullable Project project, String query, int count) {
if (project == null)
project = getProject();
- return OneDev.getInstance(IssueManager.class).query(project, query, count);
+ if (SecurityUtils.canAccess(project))
+ return OneDev.getInstance(IssueManager.class).query(project, query, count);
+ else
+ return new ArrayList<>();
}
@Override
- public List<Build> findBuilds(Project project, String query, int count) {
+ public List<Build> findBuilds(@Nullable Project project, String query, int count) {
if (project == null)
project = getProject();
return OneDev.getInstance(BuildManager.class).query(project, SecurityUtils.getUser(), query, count);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
index 0c034d0d8c..eade9e3840 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
@@ -20,6 +20,21 @@
<table wicket:id="requests" class="table"></table>
</div>
</div>
+ <wicket:fragment wicket:id="summaryFrag">
+ <div class="first-line">
+ <span wicket:id="title" class="title"></span>
+ <span wicket:id="number" class="number"></span>
+ </div>
+ <div class="second-line clearfix">
+ <div wicket:id="status" class="status pull-left"></div>
+ <div class="submission pull-left">
+ submitted by <a wicket:id="submitter"></a> <span wicket:id="submitDate"></span>
+ </div>
+ <div class="comments pull-left" title="Comments">
+ <span class="fa fa-comments-o"></span> <span wicket:id="comments"></span>
+ </div>
+ </div>
+ </wicket:fragment>
<wicket:fragment wicket:id="branchFrag">
<a wicket:id="link"></a>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index 294bbd42f4..ab56683213 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -35,6 +35,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,17 +48,22 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.PullRequestQueryBehavior;
import io.onedev.server.web.component.branch.BranchLink;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
-import io.onedev.server.web.component.pullrequest.summary.PullRequestSummaryPanel;
+import io.onedev.server.web.component.pullrequest.RequestStatusLabel;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.QueryPosition;
import io.onedev.server.web.util.QuerySaveSupport;
+import io.onedev.server.web.util.ReferenceTransformer;
@SuppressWarnings("serial")
public abstract class PullRequestListPanel extends Panel {
@@ -250,20 +256,33 @@ public abstract class PullRequestListPanel extends Panel {
@Override
public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {
- cellItem.add(new PullRequestSummaryPanel(componentId, rowModel) {
-
- @Override
- protected QueryPosition getQueryPosition() {
- if (getProject() != null) {
- OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);
- return new QueryPosition(parsedQueryModel.getObject().toString(), (int)requestsTable.getItemCount(),
- (int)requestsTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex());
- } else {
- return null;
- }
- }
-
- });
+ PullRequest request = rowModel.getObject();
+ Fragment fragment = new Fragment(componentId, "summaryFrag", PullRequestListPanel.this);
+
+ QueryPosition position;
+ if (getProject() != null) {
+ OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);
+ position = new QueryPosition(parsedQueryModel.getObject().toString(), (int)requestsTable.getItemCount(),
+ (int)requestsTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex());
+ } else {
+ position = null;
+ }
+
+ String url = RequestCycle.get().urlFor(PullRequestActivitiesPage.class,
+ PullRequestActivitiesPage.paramsOf(request, position)).toString();
+
+ fragment.add(new Label("number", "<a href='" + url + "'>#" + request.getNumber() + "</a>")
+ .setEscapeModelStrings(false));
+ ReferenceTransformer transformer = new ReferenceTransformer(request.getTargetProject(), url);
+ fragment.add(new Label("title", transformer.apply(request.getTitle())).setEscapeModelStrings(false));
+
+ fragment.add(new RequestStatusLabel("status", rowModel));
+ UserIdent submitterIdent = UserIdent.of(request.getSubmitter(), request.getSubmitterName());
+ fragment.add(new UserIdentPanel("submitter", submitterIdent, Mode.NAME));
+ fragment.add(new Label("submitDate", DateUtils.formatAge(request.getSubmitDate())));
+ fragment.add(new Label("comments", request.getCommentCount()));
+
+ cellItem.add(fragment);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css
index 167e06e292..94cda54567 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css
@@ -29,10 +29,33 @@
.pull-request-list>.body td a {
color: #444;
}
-
.pull-request-list>.body tr.request.new td.new-indicator {
background: #4667EE;
}
+
+.pull-request-list>.body td.summary .first-line {
+ margin-bottom: 8px;
+ font-weight: bold;
+ font-size: 16px;
+}
+.pull-request-list>.body td.summary .first-line>.title {
+ margin-right: 8px;
+ color: #444;
+}
+.pull-request-list>.body td.summary .second-line>* {
+ margin-right: 12px;
+}
+.pull-request-list>.body td.summary .second-line>*:last-child {
+ margin-right: 0;
+}
+.pull-request-list>.body td.summary .second-line>.status {
+ width: 75px;
+ padding: 6px 8px;
+}
+.pull-request-list>.body td.summary .second-line {
+ color: #888;
+}
+
@media(max-width: 991px) {
.pull-request-list thead, .pull-request-list td.expanded {
display: none;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.html
index aeda33e237..0a7210fd8b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.html
@@ -1,6 +1,6 @@
<wicket:panel>
<div class="referenced-from clearfix">
- <a wicket:id="link" class="pull-left"><span wicket:id="label"></span></a>
+ <span wicket:id="title" class="pull-left"></span>
<span wicket:id="state" class="pull-right"></span>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java
index 141c5d1555..4a6c3135a6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java
@@ -1,18 +1,19 @@
package io.onedev.server.web.component.pullrequest.referencedfrom;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.cycle.RequestCycle;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.pullrequest.RequestStatusLabel;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
+import io.onedev.server.web.util.ReferenceTransformer;
@SuppressWarnings("serial")
public class ReferencedFromPullRequestPanel extends GenericPanel<PullRequest> {
@@ -37,14 +38,29 @@ public class ReferencedFromPullRequestPanel extends GenericPanel<PullRequest> {
Project project = ((ProjectPage)getPage()).getProject();
PullRequest request = getModelObject();
-
- Link<Void> link = new BookmarkablePageLink<Void>("link", PullRequestActivitiesPage.class,
- PullRequestActivitiesPage.paramsOf(request, null));
- add(link);
- if (request.getTargetProject().equals(project)) {
- link.add(new Label("label", "#" + request.getNumber() + " - " + request.getTitle()));
+
+ if (SecurityUtils.canReadCode(request.getTargetProject())) {
+ String url = RequestCycle.get().urlFor(PullRequestActivitiesPage.class,
+ PullRequestActivitiesPage.paramsOf(request, null)).toString();
+ ReferenceTransformer transformer = new ReferenceTransformer(request.getTargetProject(), url);
+ String transformed = transformer.apply(request.getTitle());
+ String title;
+ if (request.getTargetProject().equals(project)) {
+ title = String.format("<a href='%s'>#%d</a> - %s", url, request.getNumber(), transformed);
+ } else {
+ title = String.format("<a href='%s'>%s#%d</a> - %s",
+ url, request.getTargetProject().getName(), request.getNumber(), transformed);
+ }
+ add(new Label("title", title).setEscapeModelStrings(false));
} else {
- link.add(new Label("label", request.getTargetProject().getName() + "#" + request.getNumber() + " - " + request.getTitle()));
+ ReferenceTransformer transformer = new ReferenceTransformer(request.getTargetProject(), null);
+ String transformed = transformer.apply(request.getTitle());
+ String title;
+ if (request.getTargetProject().equals(project))
+ title = "#" + request.getNumber() + " - " + transformed;
+ else
+ title = request.getTargetProject().getName() + "#" + request.getNumber() + " - " + transformed;
+ add(new Label("title", title).setEscapeModelStrings(false));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryCssResourceReference.java
deleted file mode 100644
index 512d685f2e..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.pullrequest.summary;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class PullRequestSummaryCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public PullRequestSummaryCssResourceReference() {
- super(PullRequestSummaryCssResourceReference.class, "pull-request-summary.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryPanel.html
deleted file mode 100644
index e759d5076b..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryPanel.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<wicket:panel>
- <div class="pull-request-summary">
- <div class="first-line">
- <a wicket:id="title" class="title"><span wicket:id="label"></span></a>
- <span wicket:id="number" class="number"></span>
- </div>
- <div class="second-line clearfix">
- <div wicket:id="status" class="status pull-left"></div>
- <div class="submission pull-left">
- submitted by <a wicket:id="submitter"></a> <span wicket:id="submitDate"></span>
- </div>
- <div class="comments pull-left" title="Comments">
- <span class="fa fa-comments-o"></span> <span wicket:id="comments"></span>
- </div>
- </div>
- </div>
-</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryPanel.java
deleted file mode 100644
index 44296c0f0d..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/summary/PullRequestSummaryPanel.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package io.onedev.server.web.component.pullrequest.summary;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.panel.GenericPanel;
-import org.apache.wicket.model.IModel;
-
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.util.DateUtils;
-import io.onedev.server.util.userident.UserIdent;
-import io.onedev.server.web.component.pullrequest.RequestStatusLabel;
-import io.onedev.server.web.component.user.ident.UserIdentPanel;
-import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
-import io.onedev.server.web.util.QueryPosition;
-
-@SuppressWarnings("serial")
-public class PullRequestSummaryPanel extends GenericPanel<PullRequest> {
-
- public PullRequestSummaryPanel(String id, IModel<PullRequest> model) {
- super(id, model);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- PullRequest request = getModelObject();
-
- add(new Label("number", "#" + request.getNumber()));
- Link<Void> link = new BookmarkablePageLink<Void>("title", PullRequestActivitiesPage.class,
- PullRequestActivitiesPage.paramsOf(request, getQueryPosition()));
- link.add(new Label("label", request.getTitle()));
- add(link);
- add(new RequestStatusLabel("status", getModel()));
- UserIdent submitterIdent = UserIdent.of(request.getSubmitter(), request.getSubmitterName());
- add(new UserIdentPanel("submitter", submitterIdent, Mode.NAME));
- add(new Label("submitDate", DateUtils.formatAge(request.getSubmitDate())));
- add(new Label("comments", request.getCommentCount()));
- }
-
- @Nullable
- protected QueryPosition getQueryPosition() {
- return null;
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new PullRequestSummaryCssResourceReference()));
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/summary/pull-request-summary.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/summary/pull-request-summary.css
deleted file mode 100644
index cbcffc3c6f..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/summary/pull-request-summary.css
+++ /dev/null
@@ -1,22 +0,0 @@
-.pull-request-summary>.first-line {
- margin-bottom: 8px;
- font-weight: bold;
- font-size: 16px;
-}
-.pull-request-summary>.first-line>.title {
- margin-right: 8px;
- color: #444;
-}
-.pull-request-summary>.second-line>* {
- margin-right: 12px;
-}
-.pull-request-summary>.second-line>*:last-child {
- margin-right: 0;
-}
-.pull-request-summary>.second-line>.status {
- width: 75px;
- padding: 6px 8px;
-}
-.pull-request-summary>.second-line {
- color: #888;
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
index 989b9dd603..57d43f7a9b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
@@ -305,7 +305,7 @@ onedev.server = {
$focusable[0].CodeMirror.focus();
} else if ($focusable.length != 0
&& $focusable.closest(".select2-container").length == 0
- && !$focusable.hasClass("input-assist")) {
+ && $focusable.closest(".no-autofocus").length == 0) {
$focusable.focus();
} else {
$inError[0].scrollIntoView({behavior: "smooth", block: "center"});
@@ -318,8 +318,7 @@ onedev.server = {
$this[0].CodeMirror.focus();
} else if ($this.closest(".select2-container").length == 0
&& $this.attr("readonly") != "readonly"
- && $this.attr("disabled") != "disabled"
- && !$this.hasClass("input-assist")) {
+ && $this.attr("disabled") != "disabled") {
$this.focus();
}
return false;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
index 1cc6b267ca..7cc954bb89 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
@@ -17,7 +17,7 @@
</div>
<div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="nav navbar-nav tabs">
- <li wicket:id="tabs"><a wicket:id="tab"></a></li>
+ <li wicket:id="navTabs"><a wicket:id="tab"></a></li>
<li wicket:id="navAdministration" class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Administration <i class="fa fa-angle-down"></i></a>
<ul class="dropdown-menu">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index ec7a13031a..08e9a4bcd9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -69,7 +69,7 @@ public abstract class LayoutPage extends BasePage {
UICustomization customization = OneDev.getInstance(UICustomization.class);
- RepeatingView tabsView = new RepeatingView("tabs");
+ RepeatingView tabsView = new RepeatingView("navTabs");
for (MainTab tab: customization.getMainTabs()) {
if (tab.isAuthorized()) {
WebMarkupContainer tabContainer = new WebMarkupContainer(tabsView.newChildId());
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index edd39e2827..f8b3a5ac40 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -64,7 +64,6 @@ import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizat
import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;
import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;
import io.onedev.server.web.page.project.setting.build.BuildSettingPage;
-import io.onedev.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage;
import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;
import io.onedev.server.web.page.project.setting.issue.PromptFieldsUponIssueOpenSettingPage;
import io.onedev.server.web.page.project.setting.issue.StateTransitionsPage;
@@ -85,7 +84,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
public static PageParameters paramsOf(Project project) {
PageParameters params = new PageParameters();
- params.set(PARAM_PROJECT, project.getName());
+ params.add(PARAM_PROJECT, project.getName());
return params;
}
@@ -356,7 +355,6 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
tabs.add(new ProjectSettingTab("Secrets", "fa fa-fw fa-key", SecretListPage.class));
tabs.add(new ProjectSettingTab("Issue Setting", "fa fa-fw fa-bug", StateTransitionsPage.class, PromptFieldsUponIssueOpenSettingPage.class));
tabs.add(new ProjectSettingTab("Build Setting", "fa fa-fw fa-cubes", BuildSettingPage.class));
- tabs.add(new ProjectSettingTab("Commit Message Transform", "fa fa-fw fa-comments", CommitMessageTransformPage.class));
tabs.add(new ProjectSettingTab("Web Hooks", "fa fa-fw fa-volume-up", WebHooksPage.class));
return tabs;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
index 47832c1faa..60ca2d582a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
@@ -61,6 +61,7 @@ import io.onedev.server.model.User;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.ajaxlistener.TrackViewStateListener;
+import io.onedev.server.web.behavior.ReferenceInputBehavior;
import io.onedev.server.web.component.diff.blob.BlobDiffPanel;
import io.onedev.server.web.component.diff.revision.DiffViewMode;
import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
@@ -209,7 +210,14 @@ public abstract class CommitOptionPanel extends Panel {
tag.put("placeholder", getDefaultCommitMessage());
}
- });
+ }.add(new ReferenceInputBehavior(true) {
+
+ @Override
+ protected Project getProject() {
+ return context.getProject();
+ }
+
+ }));
form.add(new TextArea<String>("commitDetail", new IModel<String>() {
@@ -227,6 +235,13 @@ public abstract class CommitOptionPanel extends Panel {
commitDetail = object;
}
+ }).add(new ReferenceInputBehavior(true) {
+
+ @Override
+ protected Project getProject() {
+ return context.getProject();
+ }
+
}));
AjaxButton saveButton = new AjaxButton("save") {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java
index dcf88a06da..bc82c4b7ea 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java
@@ -24,6 +24,7 @@ import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.avatar.AvatarManager;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
+import io.onedev.server.web.util.ReferenceTransformer;
/**
* Loading commits of children may take some time, and we do this via resource loading to avoid blocking
@@ -70,8 +71,10 @@ class LastCommitsResource extends AbstractResource {
LastCommitsOfChildren.Value value = entry.getValue();
PageParameters params = CommitDetailPage.paramsOf(project, value.getId().name());
- info.url = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();
- info.summary = value.getSummary();
+ String url = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();
+
+ ReferenceTransformer transformer = new ReferenceTransformer(project, url);
+ info.html = transformer.apply(value.getSummary());
info.when = DateUtils.formatAge(value.getCommitDate());
PersonIdent author = value.getAuthor();
@@ -106,9 +109,7 @@ class LastCommitsResource extends AbstractResource {
@SuppressWarnings("unused")
private static class LastCommitInfo {
- String url;
-
- String summary;
+ String html;
String when;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js
index 03e72044bb..a2e51ab8e4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js
@@ -34,8 +34,7 @@ onedev.server.folderView = {
$row.children(".last-commit.when").append("<span>" + lastCommit.when + "</span>");
var $message = $row.children(".last-commit.message");
- $message.append("<a href='" + lastCommit.url + "'></a>");
- $message.find("a").text(lastCommit.summary);
+ $message.append(lastCommit.html);
var alignment = {targetX: 0, targetY: 0, x: 0, y: 100, offset: 8};
$row.find("a.user").hover(function() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index 20fddff8a6..22be367a1f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -60,7 +60,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.MarkPos;
import io.onedev.server.search.code.CommitIndexed;
-import io.onedev.server.util.CommitMessageTransformer;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.behavior.WebSocketObserver;
@@ -82,6 +81,7 @@ import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.branches.ProjectBranchesPage;
import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
import io.onedev.server.web.page.project.tags.ProjectTagsPage;
+import io.onedev.server.web.util.ReferenceTransformer;
@SuppressWarnings("serial")
public class CommitDetailPage extends ProjectPage implements CommentSupport {
@@ -141,8 +141,8 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {
protected void onInitialize() {
super.onInitialize();
- String transformed = new CommitMessageTransformer(getProject(), null).apply(getCommit().getShortMessage());
- add(new Label("title", transformed).setEscapeModelStrings(false));
+ ReferenceTransformer transformer = new ReferenceTransformer(getProject(), null);
+ add(new Label("title", transformer.apply(getCommit().getShortMessage())).setEscapeModelStrings(false));
BlobIdent blobIdent = new BlobIdent(getCommit().name(), null, FileMode.TYPE_TREE);
ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);
@@ -168,12 +168,10 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {
});
String message = GitUtils.getDetailMessage(getCommit());
- if (message != null) {
- transformed = new CommitMessageTransformer(getProject(), null).apply(message);
- add(new Label("detail", transformed).setEscapeModelStrings(false));
- } else {
+ if (message != null)
+ add(new Label("detail", transformer.apply(message)).setEscapeModelStrings(false));
+ else
add(new WebMarkupContainer("detail").setVisible(false));
- }
add(new AjaxLazyLoadPanel("refs") {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html
index 32a71c7d5d..8702a5e95e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html
@@ -12,7 +12,7 @@
</div>
</div>
<div class="body">
- <a wicket:id="number"><span wicket:id="label"></span></a>
+ <span wicket:id="number"></span>
<span wicket:id="title"></span>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
index a59901e0ce..46a498517f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
@@ -10,8 +10,6 @@ import org.apache.wicket.event.Broadcast;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.AbstractReadOnlyModel;
@@ -39,6 +37,7 @@ import io.onedev.server.web.component.user.avatar.UserAvatar;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.util.QueryPosition;
import io.onedev.server.web.util.QueryPositionSupport;
+import io.onedev.server.web.util.ReferenceTransformer;
@SuppressWarnings("serial")
abstract class BoardCardPanel extends GenericPanel<Issue> {
@@ -174,19 +173,15 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
});
- Link<Void> link = new BookmarkablePageLink<Void>("number",
- IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(getIssue(), getPosition()));
- link.add(new Label("label", "#" + getIssue().getNumber()));
- add(link);
-
- add(new Label("title", new AbstractReadOnlyModel<String>() {
+ String url = RequestCycle.get().urlFor(IssueActivitiesPage.class,
+ IssueActivitiesPage.paramsOf(getIssue(), getPosition())).toString();
+
+ add(new Label("number", "<a href='" + url + "'>#" + getIssue().getNumber() + "</a>")
+ .setEscapeModelStrings(false));
- @Override
- public String getObject() {
- return getIssue().getTitle();
- }
-
- }));
+ ReferenceTransformer transformer = new ReferenceTransformer(getIssue().getProject(), url);
+ add(new Label("title", transformer.apply(getIssue().getTitle()))
+ .setEscapeModelStrings(false));
add(AttributeAppender.append("data-issue", getIssue().getId()));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
index 9f67e0da1f..16d877cb60 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
@@ -153,10 +153,6 @@
}
#issue-boards>.body .card a {
color: #666;
- text-decoration: none;
-}
-#issue-boards>.body .card:hover a {
- text-decoration: underline;
}
#issue-boards>.body .card .field-values>.value:last-child {
margin-right: 0;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 417a02f7c0..0f5f5e8ec1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -63,6 +63,7 @@ import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;
+import io.onedev.server.web.behavior.ReferenceInputBehavior;
import io.onedev.server.web.component.branch.BranchLink;
import io.onedev.server.web.component.branch.picker.AffinalBranchPicker;
import io.onedev.server.web.component.commit.list.CommitListPanel;
@@ -606,7 +607,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
WebMarkupContainer titleContainer = new WebMarkupContainer("title");
form.add(titleContainer);
- final TextField<String> titleInput = new TextField<String>("title", new IModel<String>() {
+ TextField<String> titleInput = new TextField<String>("title", new IModel<String>() {
@Override
public void detach() {
@@ -622,6 +623,14 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
getPullRequest().setTitle(object);
}
+ });
+ titleInput.add(new ReferenceInputBehavior(false) {
+
+ @Override
+ protected Project getProject() {
+ return NewPullRequestPage.this.getProject();
+ }
+
});
titleInput.setRequired(true).setLabel(Model.of("Title"));
titleContainer.add(titleInput);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
index bb40ee8523..1a85ae6bae 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
@@ -2,15 +2,15 @@
<div id="request-detail">
<div class="main">
<div wicket:id="requestHead" class="title">
- <div wicket:id="title" class="title"></div>
+ <span wicket:id="title" class="title"></span>
<a wicket:id="editLink" title="Edit title" class="edit"><i class="fa fa-pencil"></i></a>
<form wicket:id="editForm" class="form">
<div class="clearable-wrapper">
<input wicket:id="title" type="text" placeholder="Input title" class="form-control">
</div>
<div class="actions">
- <input wicket:id="save" type="submit" value="Save" class="btn btn-primary"/>
- <input wicket:id="cancel" type="button" value="Cancel" class="btn btn-default"/>
+ <a wicket:id="save" title="Save" value="Save" class="btn btn-success"><i class="fa fa-check"></i></a>
+ <a wicket:id="cancel" title="Cancel" type="button" value="Cancel" class="btn btn-danger"><i class="fa fa-times"></i></a>
</div>
</form>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index 3dd98dff5a..71f880900e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -103,6 +103,7 @@ import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.behavior.ReferenceInputBehavior;
import io.onedev.server.web.component.branch.BranchLink;
import io.onedev.server.web.component.build.simplelist.SimpleBuildListPanel;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
@@ -135,6 +136,7 @@ import io.onedev.server.web.util.ConfirmOnClick;
import io.onedev.server.web.util.ProjectAttachmentSupport;
import io.onedev.server.web.util.QueryPosition;
import io.onedev.server.web.util.QueryPositionSupport;
+import io.onedev.server.web.util.ReferenceTransformer;
import io.onedev.server.web.util.WicketUtils;
import io.onedev.server.web.websocket.PageDataChanged;
@@ -195,14 +197,9 @@ public abstract class PullRequestDetailPage extends ProjectPage {
requestHead.setOutputMarkupId(true);
add(requestHead);
- requestHead.add(new Label("title", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- return "#" + getPullRequest().getNumber() + " - " + getPullRequest().getTitle();
- }
-
- }) {
+ ReferenceTransformer transformer = new ReferenceTransformer(request.getTargetProject(), null);
+ String transformed = transformer.apply(request.getTitle());
+ requestHead.add(new Label("title", "#" + request.getNumber() + " - " + transformed) {
@Override
protected void onConfigure() {
@@ -210,7 +207,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {
setVisible(!isEditingTitle);
}
- });
+ }.setEscapeModelStrings(false));
requestHead.add(new AjaxLink<Void>("editLink") {
@@ -258,6 +255,13 @@ public abstract class PullRequestDetailPage extends ProjectPage {
title = object;
}
+ }).add(new ReferenceInputBehavior(false) {
+
+ @Override
+ protected Project getProject() {
+ return PullRequestDetailPage.this.getProject();
+ }
+
}));
form.add(new AjaxButton("save") {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
index 9e1103d54f..29b05fca3c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
@@ -10,15 +10,26 @@
#request-detail>.main>div {
margin-bottom: 20px;
}
-#request-detail>.main>.title>* {
- display: inline;
-}
#request-detail>.main>.title {
font-size: 20px;
font-weight: bold;
color: #444;
position: relative;
}
+#request-detail>.main>.title form {
+ position: relative;
+ padding-right: 100px;
+}
+#request-detail>.main>.title form .actions {
+ position: absolute;
+ top: 0;
+ right: 0;
+ margin: 0;
+}
+#request-detail>.main>.title form .actions a:first-child {
+ margin-right: 0;
+}
+
#request-detail>.main>.title a.edit {
color: #666;
margin-left: 8px;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.html
deleted file mode 100644
index 365bbc7eee..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<wicket:extend>
- <div class="page-title">Commit Message Transform</div>
- <form wicket:id="commitMessageTransforms" class="commit-message-transforms leave-confirm">
- <div class="help-block">
- This setting tells OneDev how to transform commit message for displaying.
- <tt>Search For</tt> expects a <a href="https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html">Java pattern</a>
- to match in the commit message, for instance, you may match JIRA issue key with <tt>([A-Z]{2,}-\d+)</tt>, and specify
- <tt>Replace With</tt> as <tt>&lt;a href=&quot;http://track.example.com/browse/$1&quot;&gt;$1&lt;/a&gt;</tt> to replace JIRA issue
- keys with issue links. Here <tt>$n</tt> represents nth capturing group in the pattern
- </div>
- <div wicket:id="editor"></div>
- <div class="actions">
- <input type="submit" class="btn btn-primary dirty-aware" value="Save setting">
- </div>
- </form>
-</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.java
deleted file mode 100644
index 3d243d5ed3..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.onedev.server.web.page.project.setting.commitmessagetransform;
-
-import java.io.Serializable;
-
-import org.apache.wicket.Session;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.web.editable.PropertyContext;
-import io.onedev.server.web.page.project.setting.ProjectSettingPage;
-
-@SuppressWarnings("serial")
-public class CommitMessageTransformPage extends ProjectSettingPage {
-
- public CommitMessageTransformPage(PageParameters params) {
- super(params);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Form<?> form = new Form<Void>("commitMessageTransforms") {
-
- @Override
- protected void onSubmit() {
- super.onSubmit();
- OneDev.getInstance(ProjectManager.class).save(getProject());
- Session.get().success("Commit message transforms are updated");
- }
-
- };
-
- form.add(PropertyContext.editModel("editor", new IModel<Serializable>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public Serializable getObject() {
- return getProject();
- }
-
- @Override
- public void setObject(Serializable object) {
- Project editingProject = (Project) object;
- getProject().setCommitMessageTransforms(editingProject.getCommitMessageTransforms());
- }
-
- }, "commitMessageTransforms"));
-
- add(form);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 1ca3b55bbb..7b0fc1bbc0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -6,10 +6,6 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.page.base.BasePage;
@SuppressWarnings("serial")
@@ -26,9 +22,6 @@ public class TestPage extends BasePage {
@Override
public void onClick() {
- Project test = OneDev.getInstance(ProjectManager.class).load(1L);
- SecurityUtils.canAccess(test);
- SecurityUtils.canAccess(test);
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java b/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java
new file mode 100644
index 0000000000..e2dd48b03d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java
@@ -0,0 +1,113 @@
+package io.onedev.server.web.util;
+
+import java.util.function.Function;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Node;
+import org.jsoup.nodes.TextNode;
+import org.unbescape.html.HtmlEscape;
+
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.util.markdown.BuildParser;
+import io.onedev.server.util.markdown.IssueParser;
+import io.onedev.server.util.markdown.PullRequestParser;
+import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;
+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
+
+public class ReferenceTransformer implements Function<String, String> {
+
+ private final Project project;
+
+ private final String url;
+
+ public ReferenceTransformer(Project project, @Nullable String url) {
+ this.project = project;
+ this.url = url;
+ }
+
+ @Override
+ public String apply(String t) {
+ String escaped = HtmlEscape.escapeHtml5(t);
+ Document doc = Jsoup.parseBodyFragment(escaped);
+
+ new IssueParser() {
+
+ @Override
+ protected String toHtml(Issue referenceable, String referenceText) {
+ return "<a href='" + RequestCycle.get().urlFor(IssueActivitiesPage.class,
+ IssueActivitiesPage.paramsOf(referenceable, null)) + "'>" + referenceText + "</a>";
+ }
+
+ @Override
+ protected Issue findReferenceable(Project project, long number) {
+ if (SecurityUtils.canAccess(project))
+ return super.findReferenceable(project, number);
+ else
+ return null;
+ }
+
+ }.parseReferences(project, doc);
+
+ new PullRequestParser() {
+
+ @Override
+ protected String toHtml(PullRequest referenceable, String referenceText) {
+ return "<a href='" + RequestCycle.get().urlFor(PullRequestActivitiesPage.class,
+ PullRequestActivitiesPage.paramsOf(referenceable, null)) + "'>" + referenceText + "</a>";
+ }
+
+ @Override
+ protected PullRequest findReferenceable(Project project, long number) {
+ if (SecurityUtils.canReadCode(project))
+ return super.findReferenceable(project, number);
+ else
+ return null;
+ }
+
+ }.parseReferences(project, doc);
+
+ new BuildParser() {
+
+ @Override
+ protected String toHtml(Build referenceable, String referenceText) {
+ return "<a href='" + RequestCycle.get().urlFor(BuildDashboardPage.class,
+ BuildDashboardPage.paramsOf(referenceable, null)) + "'>" + referenceText + "</a>";
+ }
+
+ @Override
+ protected Build findReferenceable(Project project, long number) {
+ Build build= super.findReferenceable(project, number);
+ if (build != null && SecurityUtils.canAccess(build))
+ return build;
+ else
+ return null;
+ }
+
+ }.parseReferences(project, doc);
+
+ if (url != null) {
+ StringBuilder builder = new StringBuilder();
+ for (Node node: Jsoup.parseBodyFragment(doc.body().html()).body().childNodes()) {
+ if (node instanceof TextNode) {
+ TextNode textNode = (TextNode) node;
+ builder.append("<a href='" + url + "'>" + textNode.getWholeText() + "</a>");
+ } else {
+ builder.append(node.outerHtml());
+ }
+ }
+ return builder.toString();
+ } else {
+ return doc.body().html();
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index e52bc70c54..a13a04dc5a 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -50,6 +50,8 @@ import io.onedev.server.model.User;
import io.onedev.server.model.support.Secret;
import io.onedev.server.model.support.administration.GroovyScript;
import io.onedev.server.security.permission.AccessProject;
+import io.onedev.server.security.permission.ProjectPermission;
+import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.script.ScriptContribution;
import io.onedev.server.util.script.identity.ScriptIdentity;
@@ -202,55 +204,59 @@ public class SuggestionUtils {
return suggestions;
}
- public static List<InputSuggestion> suggestIssues(@Nullable Project project, String matchWith) {
+ public static List<InputSuggestion> suggestIssues(@Nullable Project project, String matchWith, int count) {
return suggest(project, matchWith, new ProjectScopedSuggester() {
@Override
public void fillSuggestions(List<InputSuggestion> suggestions, Project project,
@Nullable User user, String matchWith, boolean prependProject) {
- for (Issue issue: OneDev.getInstance(IssueManager.class).query(
- project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS)) {
- if (prependProject)
- suggestions.add(new InputSuggestion(project.getName() + "#" + issue.getNumber(), issue.getTitle(), null));
- else
- suggestions.add(new InputSuggestion("#" + issue.getNumber(), issue.getTitle(), null));
- }
+ if (User.asSubject(user).isPermitted(new ProjectPermission(project, new AccessProject()))) {
+ for (Issue issue: OneDev.getInstance(IssueManager.class).query(
+ project, matchWith, count)) {
+ if (prependProject)
+ suggestions.add(new InputSuggestion(project.getName() + "#" + issue.getNumber(), issue.getTitle(), null));
+ else
+ suggestions.add(new InputSuggestion("#" + issue.getNumber(), issue.getTitle(), null));
+ }
+ }
}
}, "#");
}
- public static List<InputSuggestion> suggestPullRequests(@Nullable Project project, String matchWith) {
+ public static List<InputSuggestion> suggestPullRequests(@Nullable Project project, String matchWith, int count) {
return suggest(project, matchWith, new ProjectScopedSuggester() {
@Override
public void fillSuggestions(List<InputSuggestion> suggestions, Project project,
@Nullable User user, String matchWith, boolean prependProject) {
- for (PullRequest request: OneDev.getInstance(PullRequestManager.class).query(
- project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS)) {
- if (prependProject)
- suggestions.add(new InputSuggestion(project.getName() + "#" + request.getNumber(), request.getTitle(), null));
- else
- suggestions.add(new InputSuggestion("#" + request.getNumber(), request.getTitle(), null));
+ if (User.asSubject(user).isPermitted(new ProjectPermission(project, new ReadCode()))) {
+ for (PullRequest request: OneDev.getInstance(PullRequestManager.class).query(
+ project, matchWith, count)) {
+ if (prependProject)
+ suggestions.add(new InputSuggestion(project.getName() + "#" + request.getNumber(), request.getTitle(), null));
+ else
+ suggestions.add(new InputSuggestion("#" + request.getNumber(), request.getTitle(), null));
+ }
}
}
}, "#");
}
- public static List<InputSuggestion> suggestBuilds(@Nullable Project project, String matchWith) {
+ public static List<InputSuggestion> suggestBuilds(@Nullable Project project, String matchWith, int count) {
return suggest(project, matchWith, new ProjectScopedSuggester() {
@Override
public void fillSuggestions(List<InputSuggestion> suggestions, Project project,
@Nullable User user, String matchWith, boolean prependProject) {
for (Build build: OneDev.getInstance(BuildManager.class).query(
- project, user, matchWith, InputAssistBehavior.MAX_SUGGESTIONS)) {
+ project, user, matchWith, count)) {
InputSuggestion suggestion;
String description;
if (build.getVersion() != null)
- description = build.getVersion() + " : " + build.getJobName();
+ description = "(" + build.getVersion() + ") " + build.getJobName();
else
description = build.getJobName();
diff --git a/server-core/src/test/java/io/onedev/server/util/IssueUtilsTest.java b/server-core/src/test/java/io/onedev/server/util/IssueUtilsTest.java
index 938b5688f5..b1f08bb0eb 100644
--- a/server-core/src/test/java/io/onedev/server/util/IssueUtilsTest.java
+++ b/server-core/src/test/java/io/onedev/server/util/IssueUtilsTest.java
@@ -6,26 +6,12 @@ import org.junit.Test;
import com.google.common.collect.Sets;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.CommitMessageTransform;
-
public class IssueUtilsTest {
@Test
public void testParseFixedIssueNumbers() {
- Project project = new Project();
- assertEquals(Sets.newHashSet(11L, 22L, 33L), IssueUtils.parseFixedIssues(project, "fix #11, #22 and #33"));
- assertEquals(Sets.newHashSet(1L, 2L, 3L), IssueUtils.parseFixedIssues(project, "fix #1 #2 and #3"));
- assertEquals(Sets.newHashSet(11L, 22L, 33L), IssueUtils.parseFixedIssues(project, "resolves #11 , #22,#33"));
- assertEquals(Sets.newHashSet(1L, 2L, 3L, 5L, 6L), IssueUtils.parseFixedIssues(project, "resolves #1, #2,#3.#4 fixes #5 #6"));
- assertEquals(Sets.newHashSet(1L, 2L, 3L), IssueUtils.parseFixedIssues(project, "resolves #1, #2,#3.#4fixes #5 #6"));
- assertEquals(Sets.newHashSet(5L, 6L, 7L, 8L, 9L), IssueUtils.parseFixedIssues(project, "resolves fix #5 #6 and #7 and #8, #9 we finally #10"));
-
- CommitMessageTransform transform = new CommitMessageTransform();
- transform.setSearchFor("#(\\d+)");
- transform.setReplaceWith("<a href='http://track.example.com/issues/$1'>#$1</a>");
- project.getCommitMessageTransforms().add(transform);
- assertEquals(Sets.newHashSet(), IssueUtils.parseFixedIssues(project, "fix #11, #22 and #33"));
+ assertEquals(Sets.newHashSet(1L, 2L, 3L, 4L), IssueUtils.parseFixedIssueNumbers(
+ "fix issue #1,fixing issue #2 fix issue #3 and resolve issue #4: gogogo"));
}
}
diff --git a/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleJobSuggestion.java b/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleJobSuggestion.java
index d7152f39f2..190f4b8fe8 100644
--- a/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleJobSuggestion.java
+++ b/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleJobSuggestion.java
@@ -14,12 +14,14 @@ import com.google.common.collect.Lists;
import io.onedev.server.ci.job.CacheSpec;
import io.onedev.server.ci.job.Job;
import io.onedev.server.ci.job.JobSuggestion;
+import io.onedev.server.ci.job.VariableInterpolator;
import io.onedev.server.ci.job.trigger.BranchUpdateTrigger;
import io.onedev.server.ci.job.trigger.PullRequestTrigger;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
+import io.onedev.server.model.support.administration.GroovyScript;
import io.onedev.server.plugin.report.html.JobHtmlReport;
public class GradleJobSuggestion implements JobSuggestion {
@@ -38,7 +40,7 @@ public class GradleJobSuggestion implements JobSuggestion {
if (gradleBlob != null || kotlinGradleBlob != null) {
Job job = new Job();
job.setName("gradle ci");
- job.setImage("@functions." + DETERMINE_DOCKER_IMAGE + "@");
+ job.setImage("@" + VariableInterpolator.SCRIPTS_PREFIX + GroovyScript.BUILTIN_PREFIX + DETERMINE_DOCKER_IMAGE + "@");
job.setCommands(Lists.newArrayList(
"set -e",
"echo \"Detecting project version (may require some time while downloading gradle dependencies)...\"",
diff --git a/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenJobSuggestion.java b/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenJobSuggestion.java
index a13a5dc4e3..5bd6497f08 100644
--- a/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenJobSuggestion.java
+++ b/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenJobSuggestion.java
@@ -20,11 +20,13 @@ import com.google.common.collect.Lists;
import io.onedev.server.ci.job.CacheSpec;
import io.onedev.server.ci.job.Job;
import io.onedev.server.ci.job.JobSuggestion;
+import io.onedev.server.ci.job.VariableInterpolator;
import io.onedev.server.ci.job.trigger.BranchUpdateTrigger;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
+import io.onedev.server.model.support.administration.GroovyScript;
public class MavenJobSuggestion implements JobSuggestion {
@@ -41,7 +43,7 @@ public class MavenJobSuggestion implements JobSuggestion {
Job job = new Job();
job.setName("maven ci");
- job.setImage("@functions." + DETERMINE_DOCKER_IMAGE + "@");
+ job.setImage("@" + VariableInterpolator.SCRIPTS_PREFIX + GroovyScript.BUILTIN_PREFIX + DETERMINE_DOCKER_IMAGE + "@");
/*
* Before running maven test, we extract version of the project and use LogInstruction to tell
* OneDev using extracted version for current build
diff --git a/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodeJobSuggestion.java b/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodeJobSuggestion.java
index d098ae587c..78d2ca659d 100644
--- a/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodeJobSuggestion.java
+++ b/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodeJobSuggestion.java
@@ -20,11 +20,13 @@ import com.google.common.collect.Lists;
import io.onedev.server.OneDev;
import io.onedev.server.ci.job.Job;
import io.onedev.server.ci.job.JobSuggestion;
+import io.onedev.server.ci.job.VariableInterpolator;
import io.onedev.server.ci.job.trigger.BranchUpdateTrigger;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
+import io.onedev.server.model.support.administration.GroovyScript;
public class NodeJobSuggestion implements JobSuggestion {
@@ -54,9 +56,8 @@ public class NodeJobSuggestion implements JobSuggestion {
Job job = new Job();
job.setName("angular ci");
job.setImage("1dev/cispec-node:10.16-alpine-chrome");
-
List<String> commands = Lists.newArrayList(
- "echo \"##onedev[SetBuildVersion '@functions." + DETERMINE_PROJECT_VERSION + "@']\"",
+ "echo \"##onedev[SetBuildVersion '@" + VariableInterpolator.SCRIPTS_PREFIX + GroovyScript.BUILTIN_PREFIX + DETERMINE_PROJECT_VERSION + "@']\"",
"echo",
"npm install",
"npm install \\@angular/cli");
@@ -108,7 +109,7 @@ public class NodeJobSuggestion implements JobSuggestion {
job.setImage("node:10.16-alpine");
List<String> commands = Lists.newArrayList(
- "echo \"##onedev[SetBuildVersion '@functions." + DETERMINE_PROJECT_VERSION + "@']\"",
+ "echo \"##onedev[SetBuildVersion '@" + VariableInterpolator.SCRIPTS_PREFIX + GroovyScript.BUILTIN_PREFIX + DETERMINE_PROJECT_VERSION + "@']\"",
"echo",
"npm install typescript",
"npm install",
@@ -156,7 +157,7 @@ public class NodeJobSuggestion implements JobSuggestion {
job.setImage("node:10.16-alpine");
List<String> commands = Lists.newArrayList(
- "echo \"##onedev[SetBuildVersion '@functions." + DETERMINE_PROJECT_VERSION + "@']\"",
+ "echo \"##onedev[SetBuildVersion '@" + VariableInterpolator.SCRIPTS_PREFIX + GroovyScript.BUILTIN_PREFIX + DETERMINE_PROJECT_VERSION + "@']\"",
"echo",
"npm install");
@@ -198,7 +199,7 @@ public class NodeJobSuggestion implements JobSuggestion {
job.setImage("node:10.16-alpine");
List<String> commands = Lists.newArrayList(
- "echo \"##onedev[SetBuildVersion '@functions." + DETERMINE_PROJECT_VERSION + "@']\"",
+ "echo \"##onedev[SetBuildVersion '@" + VariableInterpolator.SCRIPTS_PREFIX + GroovyScript.BUILTIN_PREFIX + DETERMINE_PROJECT_VERSION + "@']\"",
"echo",
"npm install");