Skip to content

The Unified and Autonomous Development Platform

chore: Improved issue defaults

Robin Shen146633f2d03c
diff --git a/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java
index e8052d6497..6b40d1c365 100644
--- a/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java
@@ -775,15 +775,6 @@ public class DefaultDataManager implements DataManager, Serializable {
link.setOrder(1);
linkSpecManager.create(link);
- link = new LinkSpec();
- link.setName("Blocked By");
- link.setMultiple(true);
- link.setOpposite(new LinkSpecOpposite());
- link.getOpposite().setName("Blocks");
- link.getOpposite().setMultiple(true);
- link.setOrder(2);
- linkSpecManager.create(link);
-
link = new LinkSpec();
link.setName("Related");
link.setMultiple(true);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
index c7c0c10765..79eb6a70d6 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
@@ -401,22 +401,24 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
public void changeState(Issue issue, String state, Map<String, Object> fieldValues,
Collection<String> promptFields, Collection<String> removeFields, @Nullable String comment) {
String prevState = issue.getState();
- Map<String, Input> prevFields = issue.getFieldInputs();
-
- issue.setState(state);
- issue.removeFields(removeFields);
- issue.setFieldValues(fieldValues);
- issue.addMissingFields(promptFields);
- issue.validateFields();
-
- issueFieldManager.saveFields(issue);
-
- IssueChange change = new IssueChange();
- change.setIssue(issue);
- change.setUser(SecurityUtils.getUser());
- change.setData(new IssueStateChangeData(prevState, issue.getState(),
- prevFields, issue.getFieldInputs()));
- create(change, comment);
+ if (!prevState.equals(state)) {
+ Map<String, Input> prevFields = issue.getFieldInputs();
+
+ issue.setState(state);
+ issue.removeFields(removeFields);
+ issue.setFieldValues(fieldValues);
+ issue.addMissingFields(promptFields);
+ issue.validateFields();
+
+ issueFieldManager.saveFields(issue);
+
+ IssueChange change = new IssueChange();
+ change.setIssue(issue);
+ change.setUser(SecurityUtils.getUser());
+ change.setData(new IssueStateChangeData(prevState, issue.getState(),
+ prevFields, issue.getFieldInputs()));
+ create(change, comment);
+ }
}
@Transactional
@@ -485,31 +487,29 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
Project project = issue.getProject();
ProjectScope projectScope = new ProjectScope(project, true, true);
IssueStateTransitedSpec issueStateTransitedSpec = (IssueStateTransitedSpec) transition;
- if (issueStateTransitedSpec.getStates().contains(issue.getState())) {
- IssueQuery query = IssueQuery.parse(project, issueStateTransitedSpec.getIssueQuery(), option, true);
- List<Criteria<Issue>> criterias = new ArrayList<>();
-
- List<Criteria<Issue>> fromStateCriterias = new ArrayList<>();
- for (String fromState: transition.getFromStates())
- fromStateCriterias.add(new StateCriteria(fromState, IssueQueryLexer.Is));
-
- if (!fromStateCriterias.isEmpty())
- criterias.add(Criteria.orCriterias(fromStateCriterias));
- if (query.getCriteria() != null)
- criterias.add(query.getCriteria());
- query = new IssueQuery(Criteria.andCriterias(criterias), new ArrayList<>());
- Issue.push(issue);
- try {
- for (Issue each: issueManager.query(
- projectScope, query, true, 0, MAX_VALUE)) {
- String message = "State changed as issue " + issue.getReference().toString(each.getProject())
- + " transited to '" + issue.getState() + "'";
- changeState(each, issueStateTransitedSpec.getToState(), new HashMap<>(),
- new ArrayList<>(), transition.getRemoveFields(), message);
- }
- } finally {
- Issue.pop();
+ IssueQuery query = IssueQuery.parse(project, issueStateTransitedSpec.getIssueQuery(), option, true);
+ List<Criteria<Issue>> criterias = new ArrayList<>();
+
+ List<Criteria<Issue>> fromStateCriterias = new ArrayList<>();
+ for (String fromState: transition.getFromStates())
+ fromStateCriterias.add(new StateCriteria(fromState, IssueQueryLexer.Is));
+
+ if (!fromStateCriterias.isEmpty())
+ criterias.add(Criteria.orCriterias(fromStateCriterias));
+ if (query.getCriteria() != null)
+ criterias.add(query.getCriteria());
+ query = new IssueQuery(Criteria.andCriterias(criterias), new ArrayList<>());
+ Issue.push(issue);
+ try {
+ for (Issue each: issueManager.query(
+ projectScope, query, true, 0, MAX_VALUE)) {
+ String message = "State changed as issue " + issue.getReference().toString(each.getProject())
+ + " transited to '" + issue.getState() + "'";
+ changeState(each, issueStateTransitedSpec.getToState(), new HashMap<>(),
+ new ArrayList<>(), transition.getRemoveFields(), message);
}
+ } finally {
+ Issue.pop();
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
index ee33df463e..1e06e40c20 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java
@@ -38,6 +38,7 @@ import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoic
import io.onedev.server.model.support.issue.transitionspec.BranchUpdatedSpec;
import io.onedev.server.model.support.issue.transitionspec.IssueStateTransitedSpec;
import io.onedev.server.model.support.issue.transitionspec.ManualSpec;
+import io.onedev.server.model.support.issue.transitionspec.PullRequestOpenedSpec;
import io.onedev.server.model.support.issue.transitionspec.TransitionSpec;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryParseOption;
@@ -164,70 +165,78 @@ public class GlobalIssueSetting implements Serializable {
assignees.setAllowEmpty(true);
assignees.setNameOfEmptyValue("Not assigned");
assignees.setName("Assignees");
-
fieldSpecs.add(assignees);
StateSpec open = new StateSpec();
open.setName("Open");
- open.setColor("#FFA800");
-
+ open.setColor("#2095F2");
stateSpecs.add(open);
-
+
+ StateSpec inProgress = new StateSpec();
+ inProgress.setName("In Progress");
+ inProgress.setColor("#FFA700");
+ inProgress.setDescription(
+ "The AI assistant should switch the working directory to the branch corresponding to the issue by running below command:\n" +
+ "git checkout -b <branch-name> origin/main && git push -u origin <branch-name>");
+ stateSpecs.add(inProgress);
+
+ StateSpec inReview = new StateSpec();
+ inReview.setName("In Review");
+ inReview.setColor("#9C26B0");
+ inReview.setDescription(
+ "AI assistant should do the following:\n" +
+ "1. Create conventional commit for current work if there are uncommitted changes. Note that subject of the commit message should mention the issue number at the end in form of (#<issue number>)\n" +
+ "2. Push the branch to remote by running \"git push\"\n" +
+ "3. Create a pull request for current branch");
+ stateSpecs.add(inReview);
+
StateSpec closed = new StateSpec();
closed.setColor("#1BC5BD");
- closed.setName("Closed");
-
+ closed.setName("Closed");
stateSpecs.add(closed);
- var manualSpec = new ManualSpec();
- manualSpec.setFromStates(Lists.newArrayList("Open"));
- manualSpec.setToStates(Lists.newArrayList("Closed"));
- manualSpec.setAuthorizedRoles(Lists.newArrayList("Code Writer", ManualSpec.ROLE_SUBMITTER, "{Assignees}"));
- manualSpec.setIssueQuery("not(any \"Blocked By\" matching(\"State\" is \"Open\")) and not(any \"Sub Issues\" matching(\"State\" is \"Open\"))");
-
- transitionSpecs.add(manualSpec);
-
var branchUpdatedSpec = new BranchUpdatedSpec();
- branchUpdatedSpec.setFromStates(Lists.newArrayList("Open"));
branchUpdatedSpec.setToState("Closed");
branchUpdatedSpec.setBranches("main");
-
+ branchUpdatedSpec.setIssueQuery("fixed in current commit");
transitionSpecs.add(branchUpdatedSpec);
- var issueStateTransitedSpec = new IssueStateTransitedSpec();
- issueStateTransitedSpec.setFromStates(Lists.newArrayList("Open"));
- issueStateTransitedSpec.setToState("Closed");
- issueStateTransitedSpec.setStates(Lists.newArrayList("Closed"));
- issueStateTransitedSpec.setIssueQuery("any \"Sub Issues\" matching(current issue) and all \"Sub Issues\" matching(\"State\" is \"Closed\")");
+ var pullRequestOpenedSpec = new PullRequestOpenedSpec();
+ pullRequestOpenedSpec.setToState("In Review");
+ pullRequestOpenedSpec.setBranches("main");
+ pullRequestOpenedSpec.setIssueQuery("fixed in current pull request");
+ transitionSpecs.add(pullRequestOpenedSpec);
+ var issueStateTransitedSpec = new IssueStateTransitedSpec();
+ issueStateTransitedSpec.setToState("Open");
+ issueStateTransitedSpec.setIssueQuery("any \"Sub Issues\" matching(current issue) and any \"Sub Issues\" matching(\"State\" is \"Open\")");
transitionSpecs.add(issueStateTransitedSpec);
- manualSpec = new ManualSpec();
- manualSpec.setFromStates(Lists.newArrayList("Closed"));
- manualSpec.setToStates(Lists.newArrayList("Open"));
- manualSpec.setAuthorizedRoles(Lists.newArrayList("Code Writer", "Code Reader", "Issue Reporter"));
-
- transitionSpecs.add(manualSpec);
+ issueStateTransitedSpec = new IssueStateTransitedSpec();
+ issueStateTransitedSpec.setToState("In Progress");
+ issueStateTransitedSpec.setIssueQuery("any \"Sub Issues\" matching(current issue) and any \"Sub Issues\" matching(\"State\" is \"In Progress\") and all \"Sub Issues\" matching(\"State\" is after \"Open\")");
+ transitionSpecs.add(issueStateTransitedSpec);
issueStateTransitedSpec = new IssueStateTransitedSpec();
- issueStateTransitedSpec.setFromStates(Lists.newArrayList("Closed"));
- issueStateTransitedSpec.setToState("Open");
- issueStateTransitedSpec.setStates(Lists.newArrayList("Open"));
- issueStateTransitedSpec.setIssueQuery("any \"Sub Issues\" matching(current issue) or any \"Blocked By\" matching(current issue)");
-
+ issueStateTransitedSpec.setToState("In Review");
+ issueStateTransitedSpec.setIssueQuery("any \"Sub Issues\" matching(current issue) and any \"Sub Issues\" matching(\"State\" is \"In Review\") and all \"Sub Issues\" matching(\"State\" is after \"In Progress\")");
transitionSpecs.add(issueStateTransitedSpec);
- manualSpec = new ManualSpec();
- manualSpec.setAuthorizedRoles(Lists.newArrayList("Issue Manager"));
+ issueStateTransitedSpec = new IssueStateTransitedSpec();
+ issueStateTransitedSpec.setToState("Closed");
+ issueStateTransitedSpec.setIssueQuery("any \"Sub Issues\" matching(current issue) and all \"Sub Issues\" matching(\"State\" is \"Closed\")");
+ transitionSpecs.add(issueStateTransitedSpec);
+ var manualSpec = new ManualSpec();
+ manualSpec.setAuthorizedRoles(Lists.newArrayList("Code Writer", "<Issue Submitter>", "{Assignees}"));
transitionSpecs.add(manualSpec);
-
+
BoardSpec board = new BoardSpec();
board.setName(Issue.NAME_STATE);
board.setIdentifyField(Issue.NAME_STATE);
- board.setColumns(Lists.newArrayList("Open", "Closed"));
+ board.setColumns(Lists.newArrayList("Open", "In Progress", "In Review", "Closed"));
board.setDisplayFields(Lists.newArrayList(Issue.NAME_STATE, "Type", "Priority", "Assignees", IssueSchedule.NAME_ITERATION));
- board.setDisplayLinks(Lists.newArrayList("Sub Issues", "Parent Issue", "Blocked By", "Blocks", "Related"));
+ board.setDisplayLinks(Lists.newArrayList("Sub Issues", "Parent Issue", "Related"));
boardSpecs.add(board);
listFields.add(Issue.NAME_STATE);
@@ -238,23 +247,22 @@ public class GlobalIssueSetting implements Serializable {
listLinks.add("Sub Issues");
listLinks.add("Parent Issue");
- listLinks.add("Blocked By");
- listLinks.add("Blocks");
listLinks.add("Related");
namedQueries.add(new NamedIssueQuery("Open", "\"State\" is \"Open\""));
- namedQueries.add(new NamedIssueQuery("Assigned to me & Open", "\"Assignees\" is me and \"State\" is \"Open\""));
- namedQueries.add(new NamedIssueQuery("Submitted by me & Open", "submitted by me and \"State\" is \"Open\""));
+ namedQueries.add(new NamedIssueQuery("In Progress", "\"State\" is \"In Progress\""));
+ namedQueries.add(new NamedIssueQuery("In Review", "\"State\" is \"In Review\""));
+ namedQueries.add(new NamedIssueQuery("Closed", "\"State\" is \"Closed\""));
+ namedQueries.add(new NamedIssueQuery("Assigned to me & open", "\"Assignees\" is me and \"State\" is \"Open\""));
+ namedQueries.add(new NamedIssueQuery("Submitted by me & open", "submitted by me and \"State\" is \"Open\""));
namedQueries.add(new NamedIssueQuery("Assigned to me", "\"Assignees\" is me"));
namedQueries.add(new NamedIssueQuery("Submitted by me", "submitted by me"));
namedQueries.add(new NamedIssueQuery("Submitted recently", "\"Submit Date\" is since \"last week\""));
namedQueries.add(new NamedIssueQuery("Mentioned me", "mentioned me"));
- namedQueries.add(new NamedIssueQuery("Blocked issues", "any \"Blocked By\" matching(\"State\" is \"Open\") or any \"Sub Issues\" matching(\"State\" is \"Open\")"));
namedQueries.add(new NamedIssueQuery("Has activity recently", "\"Last Activity Date\" is since \"last week\""));
namedQueries.add(new NamedIssueQuery("Open & Critical", "\"State\" is \"Open\" and \"Priority\" is \"Critical\""));
namedQueries.add(new NamedIssueQuery("Open & Unassigned", "\"State\" is \"Open\" and \"Assignees\" is empty"));
namedQueries.add(new NamedIssueQuery("Open & Unscheduled", "\"State\" is \"Open\" and \"Iteration\" is empty"));
- namedQueries.add(new NamedIssueQuery("Closed", "\"State\" is \"Closed\""));
namedQueries.add(new NamedIssueQuery("All", null));
commitMessageFixPatterns = new CommitMessageFixPatterns();
@@ -604,8 +612,7 @@ public class GlobalIssueSetting implements Serializable {
for (IssueTemplate template: getIssueTemplates())
usage.add(template.getQueryUpdater().onDeleteProject(projectPath).prefix("description template #" + index++));
- return usage.prefix("issue settings");
-
+ return usage.prefix("issue settings");
}
public void onRenameRole(String oldName, String newName) {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/IssueStateTransitedSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/IssueStateTransitedSpec.java
index 7a52c6a1f6..cfc0372ed9 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/IssueStateTransitedSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitionspec/IssueStateTransitedSpec.java
@@ -2,36 +2,14 @@ package io.onedev.server.model.support.issue.transitionspec;
import static io.onedev.server.web.translation.Translation._T;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.validation.constraints.Size;
-
-import io.onedev.server.annotation.ChoiceProvider;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.IssueQuery;
-import io.onedev.server.annotation.OmitName;
-@Editable(order=550, name="State of other issue is transited to")
+@Editable(order=550, name="State of an issue is transited")
public class IssueStateTransitedSpec extends AutoSpec {
private static final long serialVersionUID = 1L;
-
- private List<String> states = new ArrayList<>();
-
- @Editable(order=100)
- @OmitName
- @ChoiceProvider("getStateChoices")
- @Size(min=1, message="At least one state needs to be specified")
- public List<String> getStates() {
- return states;
- }
-
- public void setStates(List<String> states) {
- this.states = states;
- }
-
+
@Editable(order=9900, name="Applicable Issues", placeholder="All", description="Optionally specify issues "
+ "applicable for this transition. Leave empty for all issues")
@IssueQuery(withOrder = false, withCurrentIssueCriteria = true)
@@ -46,7 +24,7 @@ public class IssueStateTransitedSpec extends AutoSpec {
@Override
public String getTriggerDescription() {
- return MessageFormat.format(_T("state of other issue is transited to \"{0}\""), states);
+ return _T("state of an issue is transited");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/McpHelperResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/McpHelperResource.java
index e268954146..721062740c 100644
--- a/server-core/src/main/java/io/onedev/server/rest/resource/McpHelperResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/resource/McpHelperResource.java
@@ -892,7 +892,7 @@ public class McpHelperResource {
return DateUtils.parseRelaxed(dateTimeDescription).getTime();
}
-
+
@Path("/query-issues")
@GET
public List<Map<String, Object>> queryIssues(
@@ -909,7 +909,6 @@ public class McpHelperResource {
if (count > RestConstants.MAX_PAGE_SIZE)
throw new NotAcceptableException("Count should not be greater than " + RestConstants.MAX_PAGE_SIZE);
-
EntityQuery<Issue> parsedQuery;
if (query != null) {
var option = new IssueQueryParseOption();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.java
index 0ddea25dc6..c392d9a695 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/statespec/IssueStateListPage.java
@@ -138,6 +138,11 @@ public class IssueStateListPage extends IssueSettingPage {
cellItem.add(AttributeAppender.append("class", "color"));
}
+ @Override
+ public String getCssClass() {
+ return "text-nowrap";
+ }
+
});
columns.add(new AbstractColumn<>(Model.of(_T("Description"))) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.html
index 8ce9e44f19..cf33a62c56 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.html
@@ -21,6 +21,7 @@
</wicket:fragment>
<wicket:fragment wicket:id="actionColumnFrag">
<a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" t:data-tippy-content="Edit"><wicket:svg href="edit" class="icon"></wicket:svg></a>
+ <a wicket:id="copy" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" t:data-tippy-content="Copy"><wicket:svg href="copy" class="icon"></wicket:svg></a>
<a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" t:data-tippy-content="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java
index a32bbf7d3f..f8e5324e66 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java
@@ -6,6 +6,9 @@ import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.SerializationUtils;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -52,12 +55,13 @@ public class StateTransitionListPage extends IssueSettingPage {
super(params);
}
- private WebMarkupContainer newEditLink(String componentId, int transitionIndex) {
+ private WebMarkupContainer newEditLink(String componentId, int transitionIndex,
+ @Nullable TransitionSpec transition) {
return new ModalLink(componentId) {
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new TransitionEditPanel(id, transitionIndex) {
+ return new TransitionEditPanel(id, transitionIndex, transition) {
@Override
protected void onSave(AjaxRequestTarget target) {
@@ -85,32 +89,7 @@ public class StateTransitionListPage extends IssueSettingPage {
protected void onInitialize() {
super.onInitialize();
- add(new ModalLink("addNew") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- return new TransitionEditPanel(id, -1) {
-
- @Override
- protected void onSave(AjaxRequestTarget target) {
- target.add(transitionsTable);
- modal.close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected GlobalIssueSetting getSetting() {
- return StateTransitionListPage.this.getSetting();
- }
-
- };
- }
-
- });
+ add(newEditLink("addNew", -1, null));
List<IColumn<TransitionSpec, Void>> columns = new ArrayList<>();
@@ -144,7 +123,7 @@ public class StateTransitionListPage extends IssueSettingPage {
TransitionSpec transition = rowModel.getObject();
Fragment fragment = new Fragment(componentId, "descriptionFrag", StateTransitionListPage.this);
int transitionIndex = cellItem.findParent(LoopItem.class).getIndex();
- var link = newEditLink("link", transitionIndex);
+ var link = newEditLink("link", transitionIndex, SerializationUtils.clone(transition));
if (transition.getFromStates().isEmpty())
link.add(new Label("fromStates", _T("[Any state]")));
else
@@ -173,8 +152,11 @@ public class StateTransitionListPage extends IssueSettingPage {
@Override
public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
int transitionIndex = cellItem.findParent(LoopItem.class).getIndex();
+ var transitionClone = SerializationUtils.clone(rowModel.getObject());
Fragment fragment = new Fragment(componentId, "actionColumnFrag", StateTransitionListPage.this);
- fragment.add(newEditLink("edit", transitionIndex));
+ fragment.add(newEditLink("edit", transitionIndex, transitionClone));
+
+ fragment.add(newEditLink("copy", -1, transitionClone));
fragment.add(new AjaxLink<Void>("delete") {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.java
index b3fd5c7456..cb15558e8c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/TransitionEditPanel.java
@@ -2,7 +2,8 @@ package io.onedev.server.web.page.admin.issuesetting.transitionspec;
import java.util.List;
-import org.apache.commons.lang3.SerializationUtils;
+import javax.annotation.Nullable;
+
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -26,23 +27,20 @@ import io.onedev.server.web.editable.BeanEditor;
abstract class TransitionEditPanel extends Panel implements InputContext {
private final int transitionIndex;
+
+ private TransitionSpec transition;
- public TransitionEditPanel(String id, int transitionIndex) {
+ public TransitionEditPanel(String id, int transitionIndex, @Nullable TransitionSpec transition) {
super(id);
this.transitionIndex = transitionIndex;
+ this.transition = transition;
}
@Override
protected void onInitialize() {
super.onInitialize();
-
- TransitionSpec transition;
- if (transitionIndex != -1)
- transition = SerializationUtils.clone(getSetting().getTransitionSpecs().get(transitionIndex));
- else
- transition = null;
-
+
var bean = new TransitionEditBean();
bean.setTransitionSpec(transition);