archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2026-02-01 17:37:19 +00:00
Code Issues Projects Releases Wiki Activity

Fix issue #1227 - Issues should be sorted by number descending after copy/move

Browse Source
This commit is contained in:
Robin Shen 2023-02-19 12:37:21 +08:00
parent 0396ea5b18
commit e4e5b4cb81
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
View File

@ -986,6 +986,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
clonedIssue.setUUID(UUID.randomUUID().toString());
clonedIssue.setProject(targetProject);
Project numberScope = targetProject.getForkRoot();
clonedIssue.setNumberScope(numberScope);
clonedIssue.setNumber(getNextNumber(numberScope));
cloneMapping.put(issue, clonedIssue);

17
server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
View File

@ -1,5 +1,6 @@
package io.onedev.server.web.component.issue.list;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.codeassist.parser.TerminalExpect;
@ -553,6 +554,14 @@ public abstract class IssueListPanel extends Panel {
add(new MenuLink("operations") {
private String getQueryAfterCopyOrMove() {
EntitySort sort = new EntitySort();
sort.setField(Issue.NAME_NUMBER);
sort.setDirection(EntitySort.Direction.DESCENDING);
IssueQuery query = new IssueQuery(null, Lists.newArrayList(sort));
return query.toString();
}
@Override
protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
List<MenuItem> menuItems = new ArrayList<>();
@ -677,7 +686,7 @@ public abstract class IssueListPanel extends Panel {
issues.add(each.getObject());
OneDev.getInstance(IssueManager.class).move(issues, getProject(), getTargetProject());
setResponsePage(ProjectIssueListPage.class,
ProjectIssueListPage.paramsOf(getTargetProject(), null, 0));
ProjectIssueListPage.paramsOf(getTargetProject(), getQueryAfterCopyOrMove(), 0));
Session.get().success("Issues moved");
}
@ -759,7 +768,7 @@ public abstract class IssueListPanel extends Panel {
issues.add(each.getObject());
OneDev.getInstance(IssueManager.class).copy(issues, getProject(), getTargetProject());
setResponsePage(ProjectIssueListPage.class,
ProjectIssueListPage.paramsOf(getTargetProject(), null, 0));
ProjectIssueListPage.paramsOf(getTargetProject(), getQueryAfterCopyOrMove(), 0));
Session.get().success("Issues copied");
}
@ -980,7 +989,7 @@ public abstract class IssueListPanel extends Panel {
}
OneDev.getInstance(IssueManager.class).move(issues, getProject(), getTargetProject());
setResponsePage(ProjectIssueListPage.class,
ProjectIssueListPage.paramsOf(getTargetProject(), null, 0));
ProjectIssueListPage.paramsOf(getTargetProject(), getQueryAfterCopyOrMove(), 0));
Session.get().success("Issues moved");
}
@ -1064,7 +1073,7 @@ public abstract class IssueListPanel extends Panel {
}
OneDev.getInstance(IssueManager.class).copy(issues, getProject(), getTargetProject());
setResponsePage(ProjectIssueListPage.class,
ProjectIssueListPage.paramsOf(getTargetProject(), null, 0));
ProjectIssueListPage.paramsOf(getTargetProject(), getQueryAfterCopyOrMove(), 0));
Session.get().success("Issues copied");
}