Skip to content

The Unified and Autonomous Development Platform

Some enhancements and bug fixes while working on worktrack

Robin Shen74a82623b74a
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.java
index c072af7c4a..3dce950d8d 100644
--- a/core/src/main/java/io/onedev/server/CoreModule.java
+++ b/core/src/main/java/io/onedev/server/CoreModule.java
@@ -221,6 +221,8 @@ import io.onedev.server.web.editable.DefaultEditSupportRegistry;
import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EditSupportLocator;
import io.onedev.server.web.editable.EditSupportRegistry;
+import io.onedev.server.web.page.layout.LayoutMenuContribution;
+import io.onedev.server.web.page.layout.LayoutPage;
import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;
import io.onedev.server.web.util.avatar.AvatarManager;
import io.onedev.server.web.util.avatar.DefaultAvatarManager;
@@ -442,6 +444,30 @@ public class CoreModule extends AbstractPluginModule {
bind(CodeCommentEventBroadcaster.class);
bind(PullRequestEventBroadcaster.class);
bind(IssueEventBroadcaster.class);
+
+ contribute(LayoutMenuContribution.class, new LayoutMenuContribution() {
+
+ @Override
+ public boolean isAuthorized() {
+ return false;
+ }
+
+ @Override
+ public Class<? extends LayoutPage> getPageClass() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public int getOrder() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getLabel() {
+ throw new UnsupportedOperationException();
+ }
+
+ });
}
private void configurePersistence() {
diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestManager.java b/core/src/main/java/io/onedev/server/manager/PullRequestManager.java
index bb50589076..6fd2b7213e 100644
--- a/core/src/main/java/io/onedev/server/manager/PullRequestManager.java
+++ b/core/src/main/java/io/onedev/server/manager/PullRequestManager.java
@@ -12,6 +12,7 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.ProjectAndBranch;
import io.onedev.server.model.support.pullrequest.MergePreview;
+import io.onedev.server.model.support.pullrequest.MergeStrategy;
import io.onedev.server.persistence.dao.EntityManager;
public interface PullRequestManager extends EntityManager<PullRequest> {
@@ -19,6 +20,9 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
@Nullable
PullRequest findEffective(ProjectAndBranch target, ProjectAndBranch source);
+ @Nullable
+ PullRequest findOpen(ProjectAndBranch target, ProjectAndBranch source);
+
Collection<PullRequest> findAllOpenTo(ProjectAndBranch target);
Collection<PullRequest> findAllOpen(ProjectAndBranch sourceOrTarget);
@@ -60,6 +64,8 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
void open(PullRequest request);
+ PullRequest open(ProjectAndBranch source, ProjectAndBranch target, MergeStrategy mergeStrategy, User submitter, String title);
+
void delete(PullRequest request);
void deleteSourceBranch(PullRequest request, @Nullable String note);
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java
index 1749f0e8fa..d3dc84e8b9 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java
@@ -1035,4 +1035,42 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
return getSession().createQuery(criteriaQuery).uniqueResult().intValue();
}
+ @Sessional
+ @Override
+ public PullRequest findOpen(ProjectAndBranch target, ProjectAndBranch source) {
+ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);
+ criteria.add(ofTarget(target)).add(ofSource(source)).add(ofOpen());
+ return find(criteria);
+ }
+
+ @Transactional
+ @Override
+ public PullRequest open(ProjectAndBranch source, ProjectAndBranch target, MergeStrategy mergeStrategy,
+ User submitter, String title) {
+ ObjectId baseCommitId = GitUtils.getMergeBase(
+ target.getProject().getRepository(), target.getObjectId(),
+ source.getProject().getRepository(), source.getObjectId(),
+ GitUtils.branch2ref(source.getBranch()));
+ if (baseCommitId != null) {
+ PullRequest request = new PullRequest();
+ request.setTarget(target);
+ request.setSource(source);
+ request.setSubmitter(submitter);
+ request.setTitle(title);
+ request.setBaseCommitHash(baseCommitId.name());
+ request.setHeadCommitHash(source.getObjectName());
+ PullRequestUpdate update = new PullRequestUpdate();
+ request.addUpdate(update);
+ update.setRequest(request);
+ update.setHeadCommitHash(request.getHeadCommitHash());
+ update.setMergeBaseCommitHash(request.getBaseCommitHash());
+ request.setMergeStrategy(mergeStrategy);
+ open(request);
+
+ return request;
+ } else {
+ throw new OneException("No merge base found");
+ }
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java
index 32b30fc929..7b5c3417f6 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java
@@ -97,14 +97,8 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
query.setParameter("submitterName", user.getDisplayName());
query.executeUpdate();
- query = getSession().createQuery("update Issue set reporter=null, reporterName=:reporterName "
- + "where reporter=:reporter");
- query.setParameter("reporter", user);
- query.setParameter("reporterName", user.getDisplayName());
- query.executeUpdate();
-
query = getSession().createQuery("update PullRequest set closeInfo.user=null, "
- + "closeInfo.userName=:closedByName where closeInfo.user=:user");
+ + "closeInfo.userName=:userName where closeInfo.user=:user");
query.setParameter("user", user);
query.setParameter("userName", user.getDisplayName());
query.executeUpdate();
@@ -129,7 +123,8 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
query.setParameter("userName", user.getDisplayName());
query.executeUpdate();
- query = getSession().createQuery("update Issue set submitter=null, submitterName=:submitterName where submitter=:submitter");
+ query = getSession().createQuery("update Issue set submitter=null, submitterName=:submitterName "
+ + "where submitter=:submitter");
query.setParameter("submitter", user);
query.setParameter("submitterName", user.getDisplayName());
query.executeUpdate();
@@ -157,7 +152,8 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
}
project.getIssueWorkflow().onDeleteUser(user.getName());
}
- }
+
+ }
@Sessional
@Override
diff --git a/core/src/main/java/io/onedev/server/web/component/projectchoice/ProjectMultiChoice.java b/core/src/main/java/io/onedev/server/web/component/projectchoice/ProjectMultiChoice.java
new file mode 100644
index 0000000000..9d2e3adaec
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/projectchoice/ProjectMultiChoice.java
@@ -0,0 +1,37 @@
+package io.onedev.server.web.component.projectchoice;
+
+import java.util.Collection;
+
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.model.IModel;
+
+import io.onedev.server.util.facade.ProjectFacade;
+import io.onedev.server.web.component.select2.Select2MultiChoice;
+
+public class ProjectMultiChoice extends Select2MultiChoice<ProjectFacade> {
+
+ private static final long serialVersionUID = 1L;
+
+ public ProjectMultiChoice(String id, IModel<Collection<ProjectFacade>> model, AbstractProjectChoiceProvider choiceProvider) {
+ super(id, model, choiceProvider);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (isRequired())
+ getSettings().setPlaceholder("Choose projects ...");
+ getSettings().setFormatResult("onedev.server.projectChoiceFormatter.formatResult");
+ getSettings().setFormatSelection("onedev.server.projectChoiceFormatter.formatSelection");
+ getSettings().setEscapeMarkup("onedev.server.projectChoiceFormatter.escapeMarkup");
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(JavaScriptHeaderItem.forReference(new ProjectChoiceResourceReference()));
+ }
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/projectchoice/ProjectSingleChoice.java b/core/src/main/java/io/onedev/server/web/component/projectchoice/ProjectSingleChoice.java
new file mode 100644
index 0000000000..d09540678f
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/projectchoice/ProjectSingleChoice.java
@@ -0,0 +1,40 @@
+package io.onedev.server.web.component.projectchoice;
+
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.model.IModel;
+
+import io.onedev.server.util.facade.ProjectFacade;
+import io.onedev.server.web.component.select2.Select2Choice;
+
+@SuppressWarnings("serial")
+public class ProjectSingleChoice extends Select2Choice<ProjectFacade> {
+
+ public ProjectSingleChoice(String id, IModel<ProjectFacade> model, AbstractProjectChoiceProvider choiceProvider) {
+ super(id, model, choiceProvider);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (isRequired())
+ getSettings().setPlaceholder("Choose a project ...");
+ getSettings().setFormatResult("onedev.server.projectChoiceFormatter.formatResult");
+ getSettings().setFormatSelection("onedev.server.projectChoiceFormatter.formatSelection");
+ getSettings().setEscapeMarkup("onedev.server.projectChoiceFormatter.escapeMarkup");
+ }
+
+ @Override
+ protected void onBeforeRender() {
+ getSettings().setAllowClear(!isRequired());
+ super.onBeforeRender();
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(JavaScriptHeaderItem.forReference(new ProjectChoiceResourceReference()));
+ }
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutMenuContribution.java b/core/src/main/java/io/onedev/server/web/page/layout/LayoutMenuContribution.java
new file mode 100644
index 0000000000..f12d8b5c6c
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutMenuContribution.java
@@ -0,0 +1,12 @@
+package io.onedev.server.web.page.layout;
+
+public interface LayoutMenuContribution {
+
+ int getOrder();
+
+ Class<? extends LayoutPage> getPageClass();
+
+ String getLabel();
+
+ boolean isAuthorized();
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
index e4beb2082d..c482095d40 100644
--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
@@ -49,6 +49,7 @@
<wicket:enclosure child="groups">
<li><a wicket:id="groups">Groups</a></li>
</wicket:enclosure>
+ <li wicket:id="extensions"><a wicket:id="link"><span wicket:id="label"></span></a></li>
<wicket:enclosure child="administration">
<li><a wicket:id="administration">Administration</a></li>
</wicket:enclosure>
diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 0ed0fe62bb..08b97021c0 100644
--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -1,6 +1,8 @@
package io.onedev.server.web.page.layout;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import org.apache.wicket.Component;
@@ -9,11 +11,13 @@ 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.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -72,6 +76,39 @@ public abstract class LayoutPage extends BasePage {
fragment.add(new ViewStateAwarePageLink<Void>("projects", ProjectListPage.class));
fragment.add(new ViewStateAwarePageLink<Void>("users", UserListPage.class).setVisible(SecurityUtils.isAdministrator()));
fragment.add(new ViewStateAwarePageLink<Void>("groups", GroupListPage.class).setVisible(SecurityUtils.isAdministrator()));
+
+ fragment.add(new ListView<LayoutMenuContribution>("extensions", new LoadableDetachableModel<List<LayoutMenuContribution>>() {
+
+ @Override
+ protected List<LayoutMenuContribution> load() {
+ List<LayoutMenuContribution> extensions = new ArrayList<>();
+ for (LayoutMenuContribution contribution: OneDev.getExtensions(LayoutMenuContribution.class)) {
+ if (contribution.isAuthorized())
+ extensions.add(contribution);
+ }
+ Collections.sort(extensions, new Comparator<LayoutMenuContribution>() {
+
+ @Override
+ public int compare(LayoutMenuContribution o1, LayoutMenuContribution o2) {
+ return o1.getOrder() - o2.getOrder();
+ }
+
+ });
+ return extensions;
+ }
+
+ }) {
+
+ @Override
+ protected void populateItem(ListItem<LayoutMenuContribution> item) {
+ LayoutMenuContribution contribution = item.getModelObject();
+ Link<Void> link = new BookmarkablePageLink<Void>("link", contribution.getPageClass());
+ link.add(new Label("label", contribution.getLabel()));
+ item.add(link);
+ }
+
+ });
+
fragment.add(new ViewStateAwarePageLink<Void>("administration", SystemSettingPage.class).setVisible(SecurityUtils.isAdministrator()));
Plugin product = AppLoader.getProduct();
diff --git a/pom.xml b/pom.xml
index 46231878c0..7408a2b936 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,6 +171,11 @@
<artifactId>jersey-container-servlet</artifactId>
<version>${jersey.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-bean-validation</artifactId>