Skip to content

The Unified and Autonomous Development Platform

fix issue #64: Order by update date by default for issues and pull requests

Robin Shen3ea039722e60
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index 2dbb71fc3a..0d640a2597 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
@@ -51,6 +51,7 @@ import io.onedev.server.model.IssueQuerySetting;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.LastUpdate;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.model.support.issue.changedata.IssueChangeData;
@@ -235,7 +236,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
}
if (orders.isEmpty())
- orders.add(builder.desc(root.get(Issue.PROP_ID)));
+ orders.add(builder.desc(IssueQuery.getPath(root, Issue.PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE)));
query.orderBy(orders);
return query;
@@ -247,8 +248,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
@Sessional
@Override
- public List<Issue> query(@Nullable Project project,
- io.onedev.server.search.entity.EntityQuery<Issue> issueQuery,
+ public List<Issue> query(@Nullable Project project, EntityQuery<Issue> issueQuery,
int firstResult, int maxResults) {
CriteriaQuery<Issue> criteriaQuery = buildCriteriaQuery(project, getSession(), issueQuery);
Query<Issue> query = getSession().createQuery(criteriaQuery);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 57aac54afc..01d7abe058 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -97,6 +97,7 @@ import io.onedev.server.model.PullRequestUpdate;
import io.onedev.server.model.User;
import io.onedev.server.model.support.BranchProtection;
import io.onedev.server.model.support.FileProtection;
+import io.onedev.server.model.support.LastUpdate;
import io.onedev.server.model.support.pullrequest.CloseInfo;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
@@ -1054,7 +1055,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
}
if (orders.isEmpty())
- orders.add(builder.desc(root.get(PullRequest.PROP_ID)));
+ orders.add(builder.desc(PullRequestQuery.getPath(root, PullRequest.PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE)));
query.orderBy(orders);
return query;