Skip to content

The Unified and Autonomous Development Platform

feat: able to add linked issues by creating new one (#1423)

Robin Shenfd90e9d2cb2a
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index 20d45ca5e0..14bcba2868 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -302,6 +302,8 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachment
private transient Collection<User> authorizedUsers;
+ private transient List<IssueLink> links;
+
public String getState() {
return state;
}
@@ -543,9 +545,11 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachment
}
public Collection<IssueLink> getLinks() {
- List<IssueLink> links = new ArrayList<>();
- links.addAll(sourceLinks);
- links.addAll(targetLinks);
+ if (links == null) {
+ links = new ArrayList<>();
+ links.addAll(sourceLinks);
+ links.addAll(targetLinks);
+ }
return links;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/IssueStateBadge.java b/server-core/src/main/java/io/onedev/server/web/component/issue/IssueStateBadge.java
index 4c2a9650f9..17a2d46005 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/IssueStateBadge.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/IssueStateBadge.java
@@ -1,14 +1,13 @@
package io.onedev.server.web.component.issue;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.model.IModel;
-
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.support.issue.StateSpec;
import io.onedev.server.util.ColorUtils;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.IModel;
@SuppressWarnings("serial")
public class IssueStateBadge extends Label {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.html
similarity index 88%
rename from server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.html
rename to server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.html
index 1ee2747fc7..26e84e79bb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.html
@@ -12,6 +12,4 @@
<a wicket:id="cancel" class="btn btn-secondary">Cancel</a>
</div>
</form>
- <wicket:fragment wicket:id="helloFrag">
- </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.java
similarity index 77%
rename from server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.java
rename to server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.java
index 4f34912da2..fc2fbc23a0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.java
@@ -1,7 +1,9 @@
-package io.onedev.server.web.page.project.issues.boards;
-
-import javax.annotation.Nullable;
+package io.onedev.server.web.component.issue.create;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
+import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -9,18 +11,12 @@ import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
-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.criteria.Criteria;
-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.server.web.component.issue.create.NewIssueEditor;
+import javax.annotation.Nullable;
@SuppressWarnings("serial")
-abstract class NewCardPanel extends Panel {
+public abstract class CreateIssuePanel extends Panel {
- public NewCardPanel(String id) {
+ public CreateIssuePanel(String id) {
super(id);
}
@@ -35,12 +31,12 @@ abstract class NewCardPanel extends Panel {
@Override
protected Project getProject() {
- return NewCardPanel.this.getProject();
+ return CreateIssuePanel.this.getProject();
}
@Override
protected Criteria<Issue> getTemplate() {
- return NewCardPanel.this.getTemplate();
+ return CreateIssuePanel.this.getTemplate();
}
};
@@ -53,8 +49,7 @@ abstract class NewCardPanel extends Panel {
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
Issue issue = editor.getConvertedInput();
- OneDev.getInstance(IssueManager.class).open(issue);
- onClose(target);
+ onSave(target, issue);
}
@Override
@@ -68,7 +63,7 @@ abstract class NewCardPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- onClose(target);
+ onCancel(target);
}
});
@@ -82,7 +77,7 @@ abstract class NewCardPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- onClose(target);
+ onCancel(target);
}
});
@@ -91,8 +86,10 @@ abstract class NewCardPanel extends Panel {
@Nullable
protected abstract Criteria<Issue> getTemplate();
+
+ protected abstract void onSave(AjaxRequestTarget target, Issue issue);
- protected abstract void onClose(AjaxRequestTarget target);
+ protected abstract void onCancel(AjaxRequestTarget target);
protected abstract Project getProject();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html
index 6404389918..adc1bb7dea 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html
@@ -26,7 +26,7 @@
<li wicket:id="milestones" class="bg-light rounded p-3">
<div class="d-flex">
<a wicket:id="link" class="mr-2"><span wicket:id="label"></span></a>
- <a wicket:id="delete" class="mr-2 flex-shrink-0" title="Remove from this milestone"><wicket:svg href="trash" class="icon icon-sm"></wicket:svg></a>
+ <a wicket:id="delete" class="mr-2 flex-shrink-0" title="Remove issue from this milestone"><wicket:svg href="trash" class="icon icon-sm"></wicket:svg></a>
<span wicket:id="status" class="status ml-auto"></span>
</div>
<div wicket:id="progress" class="mt-3"></div>
@@ -79,7 +79,7 @@
<div class="bg-light rounded p-3">
<div class="d-flex align-items-center number-and-state mb-2">
<a wicket:id="number" class="mr-2"><span wicket:id="label"></span></a>
- <a wicket:id="delete" class="mr-2 mb-1" title="Remove"><wicket:svg href="trash" class="icon icon-sm"/></a>
+ <a wicket:id="delete" class="mr-2 mb-1" title="Unlink this issue"><wicket:svg href="trash" class="icon icon-sm"/></a>
<span wicket:id="state" class="ml-auto"></span>
</div>
<div class="title d-flex text-nowrap">
@@ -96,9 +96,10 @@
<div wicket:id="name" class="head d-flex align-items-center"></div>
<ul class="body linked-issues list-unstyled mb-0">
<li wicket:id="linkedIssues"></li>
- <wicket:enclosure>
- <li class="add">
- <input wicket:id="add" type="hidden" class="form-control">
+ <wicket:enclosure child="linkNew">
+ <li class="new-link d-flex">
+ <input wicket:id="linkNew" type="hidden" placeholder="Add existing" class="form-control">
+ <a wicket:id="createNew" title="Create new" class="btn btn-icon btn-light ml-2"><wicket:svg href="plus" class="icon"></wicket:svg></a>
</li>
</wicket:enclosure>
</ul>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
index 924856ca28..c3bac2c74e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
@@ -1,71 +1,21 @@
package io.onedev.server.web.component.issue.side;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.RestartResponseAtInterceptPageException;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxCallListener;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-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.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.RepeatingView;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
import com.google.common.collect.Lists;
-
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.IssueChangeManager;
-import io.onedev.server.entitymanager.IssueManager;
-import io.onedev.server.entitymanager.IssueVoteManager;
-import io.onedev.server.entitymanager.IssueWatchManager;
-import io.onedev.server.entitymanager.LinkSpecManager;
-import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.*;
import io.onedev.server.entityreference.Referenceable;
-import io.onedev.server.model.AbstractEntity;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueVote;
-import io.onedev.server.model.IssueWatch;
-import io.onedev.server.model.LinkSpec;
-import io.onedev.server.model.Milestone;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
+import io.onedev.server.model.*;
import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryLexer;
+import io.onedev.server.search.entity.issue.IssueQueryParseOption;
import io.onedev.server.search.entity.issue.StateCriteria;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Input;
import io.onedev.server.util.LinkSide;
import io.onedev.server.util.Similarities;
+import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
@@ -76,12 +26,15 @@ import io.onedev.server.web.component.floating.AlignPlacement;
import io.onedev.server.web.component.issue.IssueStateBadge;
import io.onedev.server.web.component.issue.choice.IssueAddChoice;
import io.onedev.server.web.component.issue.choice.IssueChoiceProvider;
+import io.onedev.server.web.component.issue.create.CreateIssuePanel;
import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;
import io.onedev.server.web.component.issue.statestats.StateStatsBar;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.milestone.MilestoneStatusLabel;
import io.onedev.server.web.component.milestone.choice.AbstractMilestoneChoiceProvider;
import io.onedev.server.web.component.milestone.choice.MilestoneChoiceResourceReference;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.select2.Response;
import io.onedev.server.web.component.select2.ResponseFiller;
import io.onedev.server.web.component.select2.SelectToAddChoice;
@@ -92,6 +45,40 @@ import io.onedev.server.web.editable.InplacePropertyEditLink;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.page.project.issues.milestones.MilestoneIssuesPage;
import io.onedev.server.web.page.simple.security.LoginPage;
+import org.apache.wicket.Component;
+import org.apache.wicket.RestartResponseAtInterceptPageException;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxCallListener;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+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.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import javax.annotation.Nullable;
+import java.io.Serializable;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static io.onedev.server.search.entity.issue.IssueQuery.parse;
@SuppressWarnings("serial")
public abstract class IssueSidePanel extends Panel {
@@ -333,7 +320,7 @@ public abstract class IssueSidePanel extends Panel {
}
fragment.add(linkedIssuesView);
- fragment.add(new IssueAddChoice("add", new IssueChoiceProvider() {
+ fragment.add(new IssueAddChoice("linkNew", new IssueChoiceProvider() {
@Override
protected Project getProject() {
@@ -365,10 +352,46 @@ public abstract class IssueSidePanel extends Panel {
getIssueChangeManager().addLink(spec, getIssue(), selection, opposite);
}
}
+
+ }.setVisible(canEditIssueLink));
+
+ fragment.add(new ModalLink("createNew") {
@Override
- protected String getPlaceholder() {
- return "Add " + name.toLowerCase();
+ protected Component newContent(String id, ModalPanel modal) {
+ return new CreateIssuePanel(id) {
+
+ @Nullable
+ @Override
+ protected Criteria<Issue> getTemplate() {
+ String query;
+ var spec = model.getObject().getSpec();
+ if (opposite)
+ query = spec.getOpposite().getIssueQuery();
+ else
+ query = spec.getIssueQuery();
+ return parse(getProject(), query, new IssueQueryParseOption(), false).getCriteria();
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, Issue issue) {
+ getIssueManager().open(issue);
+ getIssueChangeManager().addLink(model.getObject().getSpec(),
+ getIssue(), issue, opposite);
+ modal.close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected Project getProject() {
+ return getIssue().getProject();
+ }
+
+ };
}
}.setVisible(canEditIssueLink));
@@ -446,7 +469,7 @@ public abstract class IssueSidePanel extends Panel {
if (prevLinkedIssue != null)
fragment.add(newLinkedIssueContainer("body", prevLinkedIssue, null));
else
- fragment.add(new Label("body", "<i>Not specified</i>").setEscapeModelStrings(false));
+ fragment.add(new WebMarkupContainer("body").setVisible(false));
return fragment;
}
@@ -473,7 +496,7 @@ public abstract class IssueSidePanel extends Panel {
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
attributes.getAjaxCallListeners().add(new ConfirmClickListener(
- "Do you really want to remove this?"));
+ "Do you really want to unlink this issue?"));
}
@Override
@@ -491,7 +514,7 @@ public abstract class IssueSidePanel extends Panel {
return getIssueManager().load(linkedIssueId);
}
- }));
+ }).add(AttributeAppender.append("class", "badge-sm")));
link = new BookmarkablePageLink<Void>("title", IssueActivitiesPage.class,
IssueActivitiesPage.paramsOf(linkedIssue));
@@ -565,7 +588,7 @@ public abstract class IssueSidePanel extends Panel {
return item.getModelObject();
}
- }));
+ }).add(AttributeAppender.append("class", "badge-sm")));
item.add(new AjaxLink<Void>("delete") {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
index 3264057ce0..51e68fbc9c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
@@ -5,6 +5,7 @@ import java.util.List;
import javax.annotation.Nullable;
+import io.onedev.server.web.component.issue.create.CreateIssuePanel;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.shiro.authz.UnauthorizedException;
import org.apache.wicket.Component;
@@ -67,7 +68,7 @@ abstract class BacklogColumnPanel extends Panel {
protected Integer load() {
if (getQuery() != null) {
try {
- return OneDev.getInstance(IssueManager.class).count(getProjectScope(), getQuery().getCriteria());
+ return getIssueManager().count(getProjectScope(), getQuery().getCriteria());
} catch (ExplicitException e) {
return 0;
}
@@ -92,10 +93,16 @@ abstract class BacklogColumnPanel extends Panel {
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new NewCardPanel(id) {
+ return new CreateIssuePanel(id) {
@Override
- protected void onClose(AjaxRequestTarget target) {
+ protected void onSave(AjaxRequestTarget target, Issue issue) {
+ getIssueManager().open(issue);
+ modal.close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
modal.close();
}
@@ -146,7 +153,7 @@ abstract class BacklogColumnPanel extends Panel {
@Override
protected void respond(AjaxRequestTarget target) {
IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
- Issue issue = OneDev.getInstance(IssueManager.class).load(params.getParameterValue("issue").toLong());
+ Issue issue = getIssueManager().load(params.getParameterValue("issue").toLong());
if (!SecurityUtils.canScheduleIssues(issue.getProject()))
throw new UnauthorizedException("Permission denied");
OneDev.getInstance(IssueChangeManager.class).removeSchedule(issue, getMilestone());
@@ -221,6 +228,10 @@ abstract class BacklogColumnPanel extends Panel {
super.onDetach();
}
+ private IssueManager getIssueManager() {
+ return OneDev.getInstance(IssueManager.class);
+ }
+
private Project getProject() {
return getProjectScope().getProject();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
index 8cc72c0fce..d280aede9b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
@@ -1,66 +1,25 @@
package io.onedev.server.web.page.project.issues.boards;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang3.SerializationUtils;
-import org.apache.shiro.authz.UnauthorizedException;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.CallbackParameter;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.event.IEvent;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-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.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.request.IRequestParameters;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.unbescape.html.HtmlEscape;
-
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
+import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueSchedule;
-import io.onedev.server.model.Milestone;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
+import io.onedev.server.model.*;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.buildspecmodel.inputspec.InputContext;
-import io.onedev.server.buildspecmodel.inputspec.InputSpec;
-import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.ChoiceProvider;
import io.onedev.server.model.support.issue.BoardSpec;
import io.onedev.server.model.support.issue.StateSpec;
import io.onedev.server.model.support.issue.TransitionSpec;
import io.onedev.server.model.support.issue.field.FieldUtils;
-import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
+import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;
import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;
import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;
-import io.onedev.server.search.entity.issue.ChoiceFieldCriteria;
-import io.onedev.server.search.entity.issue.FieldOperatorCriteria;
-import io.onedev.server.search.entity.issue.IssueQuery;
-import io.onedev.server.search.entity.issue.IssueQueryLexer;
-import io.onedev.server.search.entity.issue.MilestoneCriteria;
-import io.onedev.server.search.entity.issue.MilestoneIsEmptyCriteria;
-import io.onedev.server.search.entity.issue.StateCriteria;
+import io.onedev.server.search.entity.issue.*;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.EditContext;
@@ -68,6 +27,7 @@ import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
+import io.onedev.server.web.component.issue.create.CreateIssuePanel;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.user.ident.Mode;
@@ -75,6 +35,31 @@ import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;
import io.onedev.server.web.util.ProjectAware;
+import org.apache.commons.lang3.SerializationUtils;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.CallbackParameter;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.event.IEvent;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+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.panel.Panel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.unbescape.html.HtmlEscape;
+
+import javax.annotation.Nullable;
+import java.io.Serializable;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
@SuppressWarnings("serial")
abstract class BoardColumnPanel extends Panel implements EditContext {
@@ -288,10 +273,16 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new NewCardPanel(id) {
+ return new CreateIssuePanel(id) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, Issue issue) {
+ getIssueManager().open(issue);
+ modal.close();
+ }
@Override
- protected void onClose(AjaxRequestTarget target) {
+ protected void onCancel(AjaxRequestTarget target) {
modal.close();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
index 5d3a6a3416..f2540942d3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
@@ -2,14 +2,14 @@ package io.onedev.server.web.page.project.issues.create;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
+import io.onedev.server.buildspecmodel.inputspec.InputContext;
+import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.buildspecmodel.inputspec.InputContext;
-import io.onedev.server.buildspecmodel.inputspec.InputSpec;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryParseOption;
import io.onedev.server.util.criteria.Criteria;
@@ -31,12 +31,13 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import javax.annotation.Nullable;
import java.util.List;
@SuppressWarnings("serial")
public class NewIssuePage extends ProjectPage implements InputContext {
- private static final String PARAM_TEMPLATE = "query";
+ private static final String PARAM_TEMPLATE = "template";
private IModel<Criteria<Issue>> templateModel;
@@ -128,13 +129,13 @@ public class NewIssuePage extends ProjectPage implements InputContext {
return getIssueSetting().getFieldSpec(inputName);
}
- public static PageParameters paramsOf(Project project, String template) {
+ public static PageParameters paramsOf(Project project, @Nullable String template) {
PageParameters params = paramsOf(project);
if (template != null)
params.add(PARAM_TEMPLATE, template);
return params;
}
-
+
@Override
protected Component newProjectTitle(String componentId) {
return new Label(componentId, "<span class='text-nowrap'>Create Issue</span>").setEscapeModelStrings(false);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
index ab7a00f530..559515872b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
@@ -170,6 +170,7 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input
// Do not calculate fix builds now as it might be slow
tabs.add(new IssueTab("Fixing Builds", IssueBuildsPage.class));
}
+
if (getIssue().isConfidential() && SecurityUtils.canModify(getIssue()))
tabs.add(new IssueTab("Authorizations", IssueAuthorizationsPage.class));