The Unified and Autonomous Development Platform
Fix transitions page bug
robin shenf64e09328619
diff --git a/core/src/main/java/io/onedev/server/model/support/issueworkflow/action/DiscardPullRequest.java b/core/src/main/java/io/onedev/server/model/support/issueworkflow/action/DiscardPullRequest.javaindex f3bb7feb36..60ea4b0f39 100644--- a/core/src/main/java/io/onedev/server/model/support/issueworkflow/action/DiscardPullRequest.java+++ b/core/src/main/java/io/onedev/server/model/support/issueworkflow/action/DiscardPullRequest.java@@ -2,6 +2,7 @@ package io.onedev.server.model.support.issueworkflow.action;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.server.util.editable.annotation.BranchChoice;import io.onedev.server.util.editable.annotation.Editable;import io.onedev.server.util.editable.annotation.OmitName;@@ -13,6 +14,7 @@ public class DiscardPullRequest implements IssueAction {private String targetBranch;@Editable+ @BranchChoice@OmitName@NotEmptypublic String getTargetBranch() {diff --git a/core/src/main/java/io/onedev/server/model/support/issueworkflow/action/MergePullRequest.java b/core/src/main/java/io/onedev/server/model/support/issueworkflow/action/MergePullRequest.javaindex ee27574b97..b6c6da65d6 100644--- a/core/src/main/java/io/onedev/server/model/support/issueworkflow/action/MergePullRequest.java+++ b/core/src/main/java/io/onedev/server/model/support/issueworkflow/action/MergePullRequest.java@@ -2,6 +2,7 @@ package io.onedev.server.model.support.issueworkflow.action;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.server.util.editable.annotation.BranchChoice;import io.onedev.server.util.editable.annotation.Editable;import io.onedev.server.util.editable.annotation.OmitName;@@ -13,6 +14,7 @@ public class MergePullRequest implements IssueAction {private String targetBranch;@Editable+ @BranchChoice@OmitName@NotEmptypublic String getTargetBranch() {diff --git a/core/src/main/java/io/onedev/server/model/support/issueworkflow/action/OpenPullRequest.java b/core/src/main/java/io/onedev/server/model/support/issueworkflow/action/OpenPullRequest.javaindex 0e72e93bc9..5b432210db 100644--- a/core/src/main/java/io/onedev/server/model/support/issueworkflow/action/OpenPullRequest.java+++ b/core/src/main/java/io/onedev/server/model/support/issueworkflow/action/OpenPullRequest.java@@ -2,6 +2,7 @@ package io.onedev.server.model.support.issueworkflow.action;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.server.util.editable.annotation.BranchChoice;import io.onedev.server.util.editable.annotation.Editable;import io.onedev.server.util.editable.annotation.OmitName;@@ -13,6 +14,7 @@ public class OpenPullRequest implements IssueAction {private String targetBranch;@Editable+ @BranchChoice@OmitName@NotEmptypublic String getTargetBranch() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsPage.javaindex c0a75681a0..30b1262e15 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsPage.java@@ -98,8 +98,7 @@ public class StateTransitionsPage extends IssueWorkflowPage {@Overridepublic void populateItem(Item<ICellPopulator<StateTransition>> cellItem, String componentId, IModel<StateTransition> rowModel) {- String label = StringUtils.join(rowModel.getObject().getFromStates());- cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), label));+ cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), rowModel.getObject().getToState()));}});