The Unified and Autonomous Development Platform
create issue from global issue list page. The same for pull request
Robin Shen7b5d80a22ad2
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.javaindex 5378df580a..dc279c0c5f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java@@ -13,6 +13,7 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.util.SecurityUtils;@@ -25,10 +26,10 @@ public abstract class AffinalBranchPicker extends Panel {private String branch;- public AffinalBranchPicker(String id, Long repoId, String branch) {+ public AffinalBranchPicker(String id, Long projectId, String branch) {super(id);- this.projectId = repoId;+ this.projectId = projectId;this.branch = branch;}@@ -77,7 +78,7 @@ public abstract class AffinalBranchPicker extends Panel {return affinals;}- }, projectId) {+ }) {@Overrideprotected void onSelect(AjaxRequestTarget target, Project project) {@@ -86,6 +87,11 @@ public abstract class AffinalBranchPicker extends Panel {newBranchPicker(target);AffinalBranchPicker.this.onSelect(target, project, branch);}++ @Override+ protected Project getCurrent() {+ return OneDev.getInstance(ProjectManager.class).load(projectId);+ }});newBranchPicker(null);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.javaindex f7b7d20966..2e6bf5945e 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@@ -55,6 +55,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.search.entity.issue.IssueQuery;+import io.onedev.server.security.permission.AccessProject;import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;import io.onedev.server.util.SecurityUtils;@@ -65,10 +66,13 @@ 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;+import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.issue.IssueStateLabel;import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;+import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.project.selector.ProjectSelector;import io.onedev.server.web.component.savedquery.SavedQueriesClosed;import io.onedev.server.web.component.savedquery.SavedQueriesOpened;import io.onedev.server.web.component.stringchoice.StringMultiChoice;@@ -356,10 +360,38 @@ public abstract class IssueListPanel extends Panel {elsequery = null;- if (getProject() != null)+ if (getProject() != null) {add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, NewIssuePage.paramsOf(getProject(), query)));- else- add(new WebMarkupContainer("newIssue").setVisible(false));+ } else {+ add(new DropdownLink("newIssue") {++ @Override+ public IModel<?> getBody() {+ return Model.of("<i class='fa fa-plus'></i> New Issue <i class='fa fa-caret-down'></i>");+ }++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ return new ProjectSelector(id, new LoadableDetachableModel<Collection<Project>>() {++ @Override+ protected Collection<Project> load() {+ return OneDev.getInstance(ProjectManager.class).getPermittedProjects(+ SecurityUtils.getUser(), new AccessProject());+ }++ }) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Project project) {+ setResponsePage(NewIssuePage.class, NewIssuePage.paramsOf(project, query));+ }++ };+ }++ }.setEscapeModelStrings(false));+ }others.add(new ModalLink("batchEditSelected") {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.cssindex 4228ea9761..74a9a0f881 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css@@ -13,9 +13,10 @@margin-bottom: 20px;}.issue-list>.head>form {- margin-right: 120px;+ margin-right: 130px;}.issue-list>.head>.open-new {+ width: 120px;position: absolute;right: 0;top: 0;diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.java b/server-core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.javaindex 39d4864c2b..ce3ad938b5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/ProjectPicker.java@@ -8,9 +8,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.unbescape.html.HtmlEscape;-import io.onedev.server.OneDev;import io.onedev.server.model.Project;-import io.onedev.server.persistence.dao.Dao;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.project.selector.ProjectSelector;@@ -20,18 +18,15 @@ public abstract class ProjectPicker extends DropdownLink {private final IModel<Collection<Project>> projectsModel;- private Long currentProjectId;-- public ProjectPicker(String id, IModel<Collection<Project>> projectsModel, Long currentProjectId) {+ public ProjectPicker(String id, IModel<Collection<Project>> projectsModel) {super(id);this.projectsModel = projectsModel;- this.currentProjectId = currentProjectId;}@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {- return new ProjectSelector(id, projectsModel, currentProjectId) {+ return new ProjectSelector(id, projectsModel) {@Overrideprotected void onSelect(AjaxRequestTarget target, Project project) {@@ -40,21 +35,24 @@ public abstract class ProjectPicker extends DropdownLink {ProjectPicker.this.onSelect(target, project);}+ @Override+ protected Project getCurrent() {+ return ProjectPicker.this.getCurrent();+ }+};}@Overrideprotected void onInitialize() {super.onInitialize();-setEscapeModelStrings(false);}@Overridepublic IModel<?> getBody() {- Project currentProject = OneDev.getInstance(Dao.class).load(Project.class, currentProjectId);return Model.of(String.format("<i class='fa fa-ext fa-repo'></i> <span>%s</span> <i class='fa fa-caret-down'></i>",- HtmlEscape.escapeHtml5(currentProject.getName())));+ HtmlEscape.escapeHtml5(getCurrent().getName())));}@Override@@ -64,4 +62,7 @@ public abstract class ProjectPicker extends DropdownLink {}protected abstract void onSelect(AjaxRequestTarget target, Project project);++ protected abstract Project getCurrent();+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.css b/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.cssindex 863264e6b4..b4248e1975 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/project-list.css@@ -13,6 +13,7 @@margin-right: 130px;}.project-list>.head>.add-new {+ width: 120px;position: absolute;right: 0;top: 0;diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.javaindex 2eb7b4f07e..ac1d7649c3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java@@ -3,6 +3,8 @@ package io.onedev.server.web.component.project.selector;import java.util.Collection;import java.util.List;+import javax.annotation.Nullable;+import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.CallbackParameter;@@ -41,17 +43,14 @@ public abstract class ProjectSelector extends Panel {private final IModel<Collection<Project>> projectsModel;- private final Long currentProjectId;-private ListView<Project> projectsView;private String searchInput;- public ProjectSelector(String id, IModel<Collection<Project>> projectsModel, Long currentProjectId) {+ public ProjectSelector(String id, IModel<Collection<Project>> projectsModel) {super(id);this.projectsModel = projectsModel;- this.currentProjectId = currentProjectId;}@Override@@ -153,7 +152,7 @@ public abstract class ProjectSelector extends Panel {}};- if (project.getId().equals(currentProjectId))+ if (project.equals(getCurrent()))link.add(AttributeAppender.append("class", " current"));link.add(new ProjectAvatar("avatar", project));link.add(new Label("name", project.getName()));@@ -181,6 +180,11 @@ public abstract class ProjectSelector extends Panel {response.render(JavaScriptHeaderItem.forReference(new ProjectSelectorResourceReference()));}+ @Nullable+ protected Project getCurrent() {+ return null;+ }+protected abstract void onSelect(AjaxRequestTarget target, Project project);}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.javaindex 40ae00a799..ae2818295b 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@@ -1,11 +1,13 @@package io.onedev.server.web.component.pullrequest.list;import java.util.ArrayList;+import java.util.Collection;import java.util.Iterator;import java.util.List;import javax.annotation.Nullable;+import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -42,10 +44,12 @@ import org.slf4j.LoggerFactory;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;+import io.onedev.server.security.permission.ReadCode;import io.onedev.server.util.DateUtils;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.userident.UserIdent;@@ -53,6 +57,9 @@ 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.floating.FloatingPanel;+import io.onedev.server.web.component.link.DropdownLink;+import io.onedev.server.web.component.project.selector.ProjectSelector;import io.onedev.server.web.component.pullrequest.RequestStatusLabel;import io.onedev.server.web.component.savedquery.SavedQueriesClosed;import io.onedev.server.web.component.savedquery.SavedQueriesOpened;@@ -217,13 +224,46 @@ public abstract class PullRequestListPanel extends Panel {}});+ if (getProject() == null || SecurityUtils.canReadCode(getProject()))+ form.add(AttributeAppender.append("class", "can-create-pull-requests"));add(form);- if (getProject() != null && SecurityUtils.canReadCode(getProject())) {- add(new BookmarkablePageLink<Void>("newRequest", NewPullRequestPage.class,- NewPullRequestPage.paramsOf(getProject())));+ if (getProject() != null) {+ if (SecurityUtils.canReadCode(getProject())) {+ add(new BookmarkablePageLink<Void>("newRequest", NewPullRequestPage.class,+ NewPullRequestPage.paramsOf(getProject())));+ } else {+ add(new WebMarkupContainer("newRequest").setVisible(false));+ }} else {- add(new WebMarkupContainer("newRequest").setVisible(false));+ add(new DropdownLink("newRequest") {++ @Override+ public IModel<?> getBody() {+ return Model.of("<i class='fa fa-plus'></i> New Pull Request <i class='fa fa-caret-down'></i>");+ }++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ return new ProjectSelector(id, new LoadableDetachableModel<Collection<Project>>() {++ @Override+ protected Collection<Project> load() {+ return OneDev.getInstance(ProjectManager.class).getPermittedProjects(+ SecurityUtils.getUser(), new ReadCode());+ }++ }) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Project project) {+ setResponsePage(NewPullRequestPage.class, NewPullRequestPage.paramsOf(project));+ }++ };+ }++ }.setEscapeModelStrings(false));}body.add(new NotificationPanel("feedback", this));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.cssindex 94cda54567..2bef5eb1b5 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@@ -4,11 +4,12 @@.pull-request-list>.head>* {margin-bottom: 20px;}-.pull-request-list>.head>form {+.pull-request-list>.head>form.can-create-pull-requests {margin-right: 170px;}.pull-request-list>.head>.open-new {position: absolute;+ width: 160px;right: 0;top: 0;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.javaindex 761767b626..3a7dcd50e3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java@@ -13,6 +13,7 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.util.SecurityUtils;@@ -77,7 +78,7 @@ public abstract class AffinalRevisionPicker extends Panel {return affinals;}- }, projectId) {+ }) {@Overrideprotected void onSelect(AjaxRequestTarget target, Project project) {@@ -86,6 +87,11 @@ public abstract class AffinalRevisionPicker extends Panel {newRevisionPicker(target);AffinalRevisionPicker.this.onSelect(target, project, revision);}++ @Override+ protected Project getCurrent() {+ return OneDev.getInstance(ProjectManager.class).load(projectId);+ }});newRevisionPicker(null);diff --git a/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListCssResourceReference.javadeleted file mode 100644index 57ba97a659..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.page.issue;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class IssueListCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public IssueListCssResourceReference() {- super(IssueListCssResourceReference.class, "issue-list.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.javaindex 4316edb791..429526ee14 100644--- a/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.java@@ -7,8 +7,6 @@ import javax.annotation.Nullable;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.IModel;@@ -241,12 +239,6 @@ public class IssueListPage extends LayoutPage {});}- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new IssueListCssResourceReference()));- }-public static PageParameters paramsOf(@Nullable String query, int page) {PageParameters params = new PageParameters();if (query != null)diff --git a/server-core/src/main/java/io/onedev/server/web/page/issue/issue-list.css b/server-core/src/main/java/io/onedev/server/web/page/issue/issue-list.cssdeleted file mode 100644index 2395be3c4d..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/issue/issue-list.css+++ /dev/null@@ -1,3 +0,0 @@-#layout>.body>#issue-list .issue-list>.head>form {- margin-right: 0;-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequest/pull-request-list.css b/server-core/src/main/java/io/onedev/server/web/page/pullrequest/pull-request-list.cssindex f371b4750d..2e3c961671 100644--- a/server-core/src/main/java/io/onedev/server/web/page/pullrequest/pull-request-list.css+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequest/pull-request-list.css@@ -1,6 +1,3 @@#pull-request-list>.main {min-width: 360px;}-#layout>.body>#pull-request-list .pull-request-list>.head>form {- margin-right: 0;-}