The Unified and Autonomous Development Platform
Some minor bug fixes
Robin Shen02455962041c
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.javaindex d2ff10a847..f16b239e28 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java@@ -40,8 +40,10 @@ import com.google.common.base.Charsets;import com.google.common.base.Splitter;import io.onedev.launcher.loader.Listen;+import io.onedev.launcher.loader.ListenerRegistry;import io.onedev.server.event.RefUpdated;import io.onedev.server.event.entity.EntityRemoved;+import io.onedev.server.event.issue.IssueCommitted;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.git.Contribution;import io.onedev.server.git.Contributor;@@ -54,8 +56,10 @@ import io.onedev.server.git.command.RevListCommand;import io.onedev.server.git.command.RevListCommand.Order;import io.onedev.server.manager.BatchWorkManager;import io.onedev.server.manager.CommitInfoManager;+import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.ProjectManager;import io.onedev.server.manager.StorageManager;+import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.persistence.UnitOfWork;import io.onedev.server.persistence.annotation.Sessional;@@ -279,6 +283,10 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemeprivate final ExecutorService executorService;+ private final ListenerRegistry listenerRegistry;++ private final IssueManager issueManager;+private final Map<Long, List<String>> filesCache = new ConcurrentHashMap<>();private final Map<Long, Integer> commitCountCache = new ConcurrentHashMap<>();@@ -287,12 +295,15 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme@Injectpublic DefaultCommitInfoManager(ProjectManager projectManager, StorageManager storageManager,- BatchWorkManager batchWorkManager, UnitOfWork unitOfWork, ExecutorService executorService) {+ BatchWorkManager batchWorkManager, UnitOfWork unitOfWork, ExecutorService executorService,+ ListenerRegistry listenerRegistry, IssueManager issueManager) {this.projectManager = projectManager;this.storageManager = storageManager;this.batchWorkManager = batchWorkManager;this.unitOfWork = unitOfWork;this.executorService = executorService;+ this.listenerRegistry = listenerRegistry;+ this.issueManager = issueManager;}private boolean isCommitCollected(byte[] commitBytes) {@@ -318,6 +329,8 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemeRepository repository = project.getRepository();+ Collection<Long> fixedIssueNumbers = new HashSet<>();+env.executeInTransaction(new TransactionalExecutable() {@Override@@ -371,7 +384,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemecommitsStore.put(txn, parentCommitKey, new ArrayByteIterable(newParentCommitBytes));}- for (Long issueNumber: IssueUtils.parseFixedIssues(nextCommit.getFullMessage())) {+ for (Long issueNumber: IssueUtils.parseFixedIssues(project, nextCommit.getFullMessage())) {ByteIterable issueKey = new LongByteIterable(issueNumber);Collection<ObjectId> fixCommits = readCommits(fixCommitsStore, txn, issueKey);@@ -385,8 +398,10 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemebreak;}}- if (addNextCommit)+ if (addNextCommit) {fixCommits.add(nextCommit);+ fixedIssueNumbers.add(issueNumber);+ }writeCommits(fixCommitsStore, txn, issueKey, fixCommits);}}@@ -403,6 +418,12 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme}});++ for (Long issueNumber: fixedIssueNumbers) {+ Issue issue = issueManager.find(project, issueNumber);+ if (issue != null)+ listenerRegistry.post(new IssueCommitted(issue));+ }if (GitUtils.branch2ref(project.getDefaultBranch()).equals(refName)) {ObjectId lastCommitId =diff --git a/core/src/main/java/io/onedev/server/model/Build.java b/core/src/main/java/io/onedev/server/model/Build.javaindex ba340c86b9..64d1301b02 100644--- a/core/src/main/java/io/onedev/server/model/Build.java+++ b/core/src/main/java/io/onedev/server/model/Build.java@@ -153,7 +153,7 @@ public class Build extends AbstractEntity {RevCommit commit;while ((commit = revWalk.next()) != null)- fixedIssueNumbers.get().addAll(IssueUtils.parseFixedIssues(commit.getFullMessage()));+ fixedIssueNumbers.get().addAll(IssueUtils.parseFixedIssues(project, commit.getFullMessage()));} catch (IOException e) {throw new RuntimeException(e);}diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.javaindex c711776a4b..3dea46163f 100644--- a/core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java@@ -799,7 +799,7 @@ public class PullRequest extends AbstractEntity implements Referenceable {if (fixedIssues == null) {fixedIssues = new HashSet<>();for (RevCommit commit: getCommits()) {- for (Long issueNumber: IssueUtils.parseFixedIssues(commit.getFullMessage())) {+ for (Long issueNumber: IssueUtils.parseFixedIssues(getTargetProject(), commit.getFullMessage())) {Issue issue = OneDev.getInstance(IssueManager.class).find(getTargetProject(), issueNumber);if (issue != null)fixedIssues.add(issue);diff --git a/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java b/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.javaindex 2d411071bd..45e2c56baf 100644--- a/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java+++ b/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java@@ -108,7 +108,7 @@ public class GlobalIssueSetting implements Serializable {Choice normal = new Choice();normal.setValue("Normal");- normal.setColor("#009a1a");+ normal.setColor("#9fc5e8");choices.add(normal);Choice major = new Choice();diff --git a/core/src/main/java/io/onedev/server/model/support/usermatcher/CodeReaders.java b/core/src/main/java/io/onedev/server/model/support/usermatcher/CodeReaders.javaindex 544b09414a..eb541c8a7f 100644--- a/core/src/main/java/io/onedev/server/model/support/usermatcher/CodeReaders.java+++ b/core/src/main/java/io/onedev/server/model/support/usermatcher/CodeReaders.java@@ -6,7 +6,7 @@ import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=200, name="Users allowed to write code")+@Editable(order=200, name="Users allowed to read code")public class CodeReaders implements UserMatcher {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/model/support/usermatcher/IssueReaders.java b/core/src/main/java/io/onedev/server/model/support/usermatcher/IssueReaders.javaindex a0fc1e47bb..ca1b241333 100644--- a/core/src/main/java/io/onedev/server/model/support/usermatcher/IssueReaders.java+++ b/core/src/main/java/io/onedev/server/model/support/usermatcher/IssueReaders.java@@ -6,7 +6,7 @@ import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=100, name="Users allowed to write code")+@Editable(order=100, name="Users allowed to read issues")public class IssueReaders implements UserMatcher {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/model/support/usermatcher/ProjectAdministrators.java b/core/src/main/java/io/onedev/server/model/support/usermatcher/ProjectAdministrators.javaindex a2d5556ce1..a819c2a0dc 100644--- a/core/src/main/java/io/onedev/server/model/support/usermatcher/ProjectAdministrators.java+++ b/core/src/main/java/io/onedev/server/model/support/usermatcher/ProjectAdministrators.java@@ -6,7 +6,7 @@ import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=400, name="Users allowed to write code")+@Editable(order=400, name="Project administrator")public class ProjectAdministrators implements UserMatcher {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.javaindex 88cbff0590..70635c33b8 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java@@ -62,7 +62,7 @@ public class FixedBetweenCriteria extends IssueCriteria {RevCommit commit;while ((commit = revWalk.next()) != null)- fixedIssueNumbers.addAll(IssueUtils.parseFixedIssues(commit.getFullMessage()));+ fixedIssueNumbers.addAll(IssueUtils.parseFixedIssues(project, commit.getFullMessage()));} catch (IOException e) {throw new RuntimeException(e);}@@ -87,7 +87,7 @@ public class FixedBetweenCriteria extends IssueCriteria {RevCommit commit;while ((commit = revWalk.next()) != null) {- if (IssueUtils.parseFixedIssues(commit.getFullMessage()).contains(issue.getNumber()))+ if (IssueUtils.parseFixedIssues(issue.getProject(), commit.getFullMessage()).contains(issue.getNumber()))return true;}return false;diff --git a/core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java b/core/src/main/java/io/onedev/server/util/CommitMessageTransformer.javaindex 64441e640b..d5a1005ae3 100644--- a/core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java+++ b/core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java@@ -1,5 +1,6 @@package io.onedev.server.util;+import java.util.Collection;import java.util.regex.Matcher;import java.util.regex.Pattern;@@ -46,15 +47,20 @@ public class CommitMessageTransformer implements Transformer<String> {this.commitUrl = commitUrl;}- @Override- public String transform(String commitMessage) {+ public static String transform(String commitMessage, Collection<CommitMessageTransform> transforms) {commitMessage = HtmlEscape.escapeHtml5(commitMessage);try {- for (CommitMessageTransform transform: project.getCommitMessageTransforms())+ 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 transform(String commitMessage) {+ commitMessage = transform(commitMessage, project.getCommitMessageTransforms());commitMessage = linkEntities(project, commitMessage, new EntityInfoProvider() {diff --git a/core/src/main/java/io/onedev/server/util/IssueUtils.java b/core/src/main/java/io/onedev/server/util/IssueUtils.javaindex e1e7694c7b..d17a894d47 100644--- a/core/src/main/java/io/onedev/server/util/IssueUtils.java+++ b/core/src/main/java/io/onedev/server/util/IssueUtils.java@@ -10,6 +10,11 @@ import java.util.StringTokenizer;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;@@ -71,15 +76,29 @@ public class IssueUtils {return fieldValues;}- public static Collection<Long> parseFixedIssues(String str) {+ public static Collection<Long> parseFixedIssues(Project project, String commitMessage) {Collection<Long> issueNumbers = new HashSet<>();++ /*+ * 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());- StringTokenizer tokenizer = new StringTokenizer(str);- 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);+ // 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);+ }+ }}}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.htmlindex 0ae6b51a57..8f76f9d655 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html@@ -27,6 +27,7 @@<div class="first-line"><a wicket:id="title" class="title"><span wicket:id="label"></span></a><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><div class="second-line clearfix"><span wicket:id="state" class="state pull-left"></span>diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex 96bfe8755c..cab29c2328 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -58,6 +58,7 @@ import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.IssueQueryBehavior;+import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.datatable.HistoryAwareDataTable;import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;@@ -513,6 +514,8 @@ public abstract class IssueListPanel extends GenericPanel<String> {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()))));+fragment.add(new IssueStateLabel("state", rowModel));UserIdent submitterIdent = UserIdent.of(UserFacade.of(issue.getSubmitter()), issue.getSubmitterName());diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css b/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.cssindex 07aa0e7a72..d50e6c8c6f 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css@@ -38,6 +38,13 @@.issue-list>.body td.summary .title {margin-right: 8px;}+.issue-list>.body td.summary .number {+ margin-right: 4px;+}+.issue-list>.body td.summary .copy {+ font-size: 14px;+}+.issue-list>.body td.summary .second-line>* {margin-right: 12px;}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.html b/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.htmlindex 052e21cc46..e485d35007 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.html+++ b/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.html@@ -15,5 +15,6 @@<wicket:fragment wicket:id="titleViewFrag"><span wicket:id="title"></span><a wicket:id="edit" title="Edit title" class="edit"><i class="fa fa-pencil"></i></a>+ <a wicket:id="copy" title="Copy issue number and title" class="copy"><i class="fa fa-copy"></i></a></wicket:fragment></wicket:panel>diff --git a/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java b/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.javaindex 01baca98d7..fedeb497ff 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java@@ -5,6 +5,7 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.TextField;@@ -18,6 +19,7 @@ import io.onedev.server.OneDev;import io.onedev.server.manager.IssueChangeManager;import io.onedev.server.model.Issue;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;@SuppressWarnings("serial")public abstract class IssueTitlePanel extends Panel {@@ -105,6 +107,7 @@ public abstract class IssueTitlePanel extends Panel {}});+ titleViewer.add(new WebMarkupContainer("copy").add(new CopyClipboardBehavior(Model.of("#" + getIssue().getNumber() + ": " + getIssue().getTitle()))));titleViewer.setOutputMarkupId(true);diff --git a/core/src/main/java/io/onedev/server/web/component/issue/title/issue-title.css b/core/src/main/java/io/onedev/server/web/component/issue/title/issue-title.cssindex ea0fac0c5a..56d4007b78 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/title/issue-title.css+++ b/core/src/main/java/io/onedev/server/web/component/issue/title/issue-title.css@@ -7,6 +7,12 @@.issue-title a.edit {color: #666;margin-left: 8px;+ font-size: 16px;+}+.issue-title a.copy {+ color: #666;+ margin-left: 4px;+ font-size: 16px;}.issue-title input[type=text] {font-weight: normal;diff --git a/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.htmlindex 79148f9133..20a56b2943 100644--- a/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.html@@ -1,5 +1,5 @@<wicket:panel><div class="clearable-wrapper">- <input wicket:id="input" type="text" class="form-control"></input>+ <input wicket:id="input" type="text" class="form-control" autocomplete="off"></div></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.htmlindex bc53e94ad2..77056c6a75 100644--- a/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.html+++ b/core/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.html@@ -1,3 +1,3 @@<wicket:panel>- <input wicket:id="input" type="password" autocomplete="new-password" class="form-control"></input>+ <input wicket:id="input" type="password" autocomplete="new-password" class="form-control"></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.cssindex 1d24234c4c..b58051cb7f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css@@ -59,7 +59,7 @@}#issue-boards>.body>.column {flex: 1 1 auto;- min-width: 300px;+ min-width: 360px;height: 100%;/* hack to makes all column of same width and same space */padding-right: 20px;@@ -93,6 +93,7 @@position: relative;padding: 16px 16px 0 16px;height: 100%;+ overflow: auto;}#issue-boards>.body>.column>.content>.body.issue-droppable.ui-droppable-active {background: #FDF2C5;@@ -121,17 +122,26 @@box-shadow: 2px 2px 6px 2px rgba(0, 0, 0, 0.3);border-width: 1px;font-weight: normal;+ white-space: normal;}#issue-boards>.body .card {font-size: 13px;}-#issue-boards>.body .card .head {- margin-bottom: 8px;-}#issue-boards>.body .card .head>* {- margin-right: 8px;+ margin: 0 8px 8px 0;}+#issue-boards>.body .card .head .field-values .value span {+ background: #EEE;+ padding: .2em .6em .3em;+ border-radius: .25em;+ font-size: 75%;+ font-weight: bold;+ line-height: 1;+ white-space: nowrap;+ vertical-align: baseline;+}+#issue-boards>.body .card .head>.avatars {margin-right: 0;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.javaindex a2f0f73706..8285e3212d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java@@ -80,6 +80,11 @@ public class NewIssuePage extends ProjectPage implements InputContext {protected Project getProject() {return NewIssuePage.this.getProject();}++ @Override+ protected IssueCriteria getTemplate() {+ return templateModel.getObject();+ }};Form<?> form = new Form<Void>("form") {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.cssindex 34f2e3ce6e..e2f399e699 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css@@ -10,15 +10,6 @@margin-right: 30px;}-@media(max-width: 1090px) {- ul.nav-tabs>li.collapsed {- display: block;- }- ul.nav-tabs>li.expanded {- display: none;- }-}-@media(min-width: 1150px) {#issue-detail>.main {padding-right: 360px;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex c88ff13f49..4350fc3a4d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -8,6 +8,7 @@ import java.util.Date;import java.util.List;import java.util.concurrent.atomic.AtomicReference;+import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.RestartResponseAtInterceptPageException;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -160,6 +161,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {GitUtils.branch2ref(source.getBranch()));if (baseCommitId != null) {PullRequest request = new PullRequest();+ request.setTitle(StringUtils.capitalize(source.getBranch().replace('-', ' ').replace('_', ' ').toLowerCase()));pullRequestRef.set(request);request.setTarget(target);request.setSource(source);diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex a88156ac8a..a83d9aeedc 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -256,7 +256,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {}target.add(requestHead);- target.appendJavaScript("$(window).resize();");+ target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");}});@@ -267,7 +267,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {public void onClick(AjaxRequestTarget target) {isEditingTitle = false;target.add(requestHead);- target.appendJavaScript("$(window).resize();");+ target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");}});@@ -301,7 +301,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {}}WicketUtils.markLastVisibleChild(this);- pageDataChanged.getHandler().appendJavaScript("$(window).resize();");+ pageDataChanged.getHandler().appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");}}@@ -440,7 +440,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {@Overridepublic void navTo(AjaxRequestTarget target, PullRequest entity, QueryPosition position) {- PageParameters params = PullRequestDetailPage.paramsOf(request, position);+ PageParameters params = PullRequestDetailPage.paramsOf(entity, position);setResponsePage(getPageClass(), params);}@@ -804,7 +804,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {reviewUpdateId = getPullRequest().getLatestUpdate().getId();operationsContainer.replace(newOperationConfirm(confirmId, APPROVE, operationsContainer));target.add(operationsContainer);- target.appendJavaScript("$(window).resize();");+ target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");}@Override@@ -822,7 +822,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {reviewUpdateId = getPullRequest().getLatestUpdate().getId();operationsContainer.replace(newOperationConfirm(confirmId, REQUEST_FOR_CHANGES, operationsContainer));target.add(operationsContainer);- target.appendJavaScript("$(window).resize();");+ target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");}@Override@@ -839,7 +839,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {public void onClick(AjaxRequestTarget target) {operationsContainer.replace(newOperationConfirm(confirmId, DISCARD, operationsContainer));target.add(operationsContainer);- target.appendJavaScript("$(window).resize();");+ target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");}@Override@@ -855,7 +855,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {public void onClick(AjaxRequestTarget target) {operationsContainer.replace(newOperationConfirm(confirmId, REOPEN, operationsContainer));target.add(operationsContainer);- target.appendJavaScript("$(window).resize();");+ target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");}@Override@@ -871,7 +871,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {public void onClick(AjaxRequestTarget target) {operationsContainer.replace(newOperationConfirm(confirmId, DELETE_SOURCE_BRANCH, operationsContainer));target.add(operationsContainer);- target.appendJavaScript("$(window).resize();");+ target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");}@Override@@ -887,7 +887,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {public void onClick(AjaxRequestTarget target) {operationsContainer.replace(newOperationConfirm(confirmId, RESTORE_SOURCE_BRANCH, operationsContainer));target.add(operationsContainer);- target.appendJavaScript("$(window).resize();");+ target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");}@Override@@ -968,13 +968,13 @@ public abstract class PullRequestDetailPage extends ProjectPage {target.add(feedback);target.add(hint);- target.appendJavaScript("$(window).resize();");+ target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");reviewUpdateId = getPullRequest().getLatestUpdate().getId();} else if (!operation.canOperate(request)) {error("Not allowed to " + getOperationName(operation) + " at this point");target.add(feedback);target.add(hint);- target.appendJavaScript("$(window).resize();");+ target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");} else {operation.operate(request, noteInput.getModelObject());setResponsePage(PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(getPullRequest(), position));@@ -1011,7 +1011,7 @@ public abstract class PullRequestDetailPage extends ProjectPage {public void onClick(AjaxRequestTarget target) {fragment.replaceWith(new WebMarkupContainer(id).setVisible(false));target.add(operationsContainer);- target.appendJavaScript("$(window).resize();");+ target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");}});diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.cssindex 0b43d20e7a..ce0e6a5bc6 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css@@ -1,8 +1,8 @@@media(max-width: 1270px) {- ul.nav-tabs>li.collapsed {+ #request-detail>.main ul.nav-tabs>li.collapsed {display: block;}- ul.nav-tabs>li.expanded {+ #request-detail>.main ul.nav-tabs>li.expanded {display: none;}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css b/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.cssindex 387aee1880..0f5d39d101 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css@@ -10,10 +10,10 @@ body.BranchProtectionPage, body.WebHooksPage {}}@media(max-width: 991px) {- ul.nav-tabs>li.collapsed {+ #project-setting .issue-setting ul.nav-tabs>li.collapsed {display: block;}- ul.nav-tabs>li.expanded {+ #project-setting .issue-setting ul.nav-tabs>li.expanded {display: none;}}diff --git a/core/src/test/java/io/onedev/server/util/IssueUtilsTest.java b/core/src/test/java/io/onedev/server/util/IssueUtilsTest.javaindex cd86ddcb12..938b5688f5 100644--- a/core/src/test/java/io/onedev/server/util/IssueUtilsTest.java+++ b/core/src/test/java/io/onedev/server/util/IssueUtilsTest.java@@ -6,16 +6,26 @@ 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 {@Testpublic void testParseFixedIssueNumbers() {- assertEquals(Sets.newHashSet(11L, 22L, 33L), IssueUtils.parseFixedIssues("fix #11, #22 and #33"));- assertEquals(Sets.newHashSet(1L, 2L, 3L), IssueUtils.parseFixedIssues("fix #1 #2 and #3"));- assertEquals(Sets.newHashSet(11L, 22L, 33L), IssueUtils.parseFixedIssues("resolves #11 , #22,#33"));- assertEquals(Sets.newHashSet(1L, 2L, 3L, 5L, 6L), IssueUtils.parseFixedIssues("resolves #1, #2,#3.#4 fixes #5 #6"));- assertEquals(Sets.newHashSet(1L, 2L, 3L), IssueUtils.parseFixedIssues("resolves #1, #2,#3.#4fixes #5 #6"));- assertEquals(Sets.newHashSet(5L, 6L, 7L, 8L, 9L), IssueUtils.parseFixedIssues("resolves fix #5 #6 and #7 and #8, #9 we finally #10"));+ 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"));}}