Skip to content

The Unified and Autonomous Development Platform

Sort group/user choice alphabetically

Robin Shen44d3c82cf8bb
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java
index 473df6880c..f7e7a686d2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java
@@ -60,7 +60,7 @@ public class BuildChoiceProvider extends ChoiceProvider<Build> {
@Override
public void query(String term, int page, Response<Build> response) {
- int count = (page+1) * WebConstants.PAGE_SIZE;
+ int count = (page+1) * WebConstants.PAGE_SIZE + 1;
Project project = projectModel.getObject();
if (project != null) {
List<Build> builds = OneDev.getInstance(BuildManager.class).query(project, term, count);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java
index a7ff7c4ff0..4ba61ad837 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java
@@ -58,7 +58,7 @@ public class IssueChoiceProvider extends ChoiceProvider<Issue> {
@Override
public void query(String term, int page, Response<Issue> response) {
- int count = (page+1) * WebConstants.PAGE_SIZE;
+ int count = (page+1) * WebConstants.PAGE_SIZE + 1;
Project project = projectModel.getObject();
List<Issue> issues = OneDev.getInstance(IssueManager.class).query(project, term, count);
new ResponseFiller<>(response).fill(issues, page, WebConstants.PAGE_SIZE);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectChoiceProvider.java
index 9a1a1fdf47..d7ea991892 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/choice/ProjectChoiceProvider.java
@@ -1,9 +1,10 @@
package io.onedev.server.web.component.project.choice;
-import java.util.ArrayList;
-import java.util.Comparator;
+import java.util.Collection;
import java.util.List;
+import org.apache.wicket.model.IModel;
+
import io.onedev.server.model.Project;
import io.onedev.server.util.match.MatchScoreProvider;
import io.onedev.server.util.match.MatchScoreUtils;
@@ -15,16 +16,21 @@ public class ProjectChoiceProvider extends AbstractProjectChoiceProvider {
private static final long serialVersionUID = 1L;
- private final List<Project> choices;
+ private final IModel<Collection<Project>> choicesModel;
- public ProjectChoiceProvider(List<Project> choices) {
- this.choices = new ArrayList<>(choices);
- this.choices.sort(Comparator.comparing(Project::getName));
+ public ProjectChoiceProvider(IModel<Collection<Project>> choicesModel) {
+ this.choicesModel = choicesModel;
}
+ @Override
+ public void detach() {
+ choicesModel.detach();
+ super.detach();
+ }
+
@Override
public void query(String term, int page, Response<Project> response) {
- List<Project> matched = MatchScoreUtils.filterAndSort(choices, new MatchScoreProvider<Project>() {
+ List<Project> matched = MatchScoreUtils.filterAndSort(choicesModel.getObject(), new MatchScoreProvider<Project>() {
@Override
public double getMatchScore(Project object) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java
index 67ba6bd755..365dd443d7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java
@@ -58,7 +58,7 @@ public class PullRequestChoiceProvider extends ChoiceProvider<PullRequest> {
@Override
public void query(String term, int page, Response<PullRequest> response) {
- int count = (page+1) * WebConstants.PAGE_SIZE;
+ int count = (page+1) * WebConstants.PAGE_SIZE + 1;
Project project = projectModel.getObject();
List<PullRequest> requests = OneDev.getInstance(PullRequestManager.class)
.query(project, term, count);
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java
index f6abfebed0..81a053d8fa 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectMultiChoiceEditor.java
@@ -7,6 +7,7 @@ import java.util.List;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -21,7 +22,14 @@ import io.onedev.server.web.editable.PropertyEditor;
@SuppressWarnings("serial")
public class ProjectMultiChoiceEditor extends PropertyEditor<List<String>> {
- private final List<Project> choices = new ArrayList<>();
+ private final IModel<Collection<Project>> choicesModel = new LoadableDetachableModel<Collection<Project>>() {
+
+ @Override
+ protected Collection<Project> load() {
+ return OneDev.getInstance(ProjectManager.class).query();
+ }
+
+ };
private ProjectMultiChoice input;
@@ -30,23 +38,27 @@ public class ProjectMultiChoiceEditor extends PropertyEditor<List<String>> {
super(id, propertyDescriptor, propertyModel);
}
+ @Override
+ protected void onDetach() {
+ choicesModel.detach();
+ super.onDetach();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
- choices.addAll(OneDev.getInstance(ProjectManager.class).query());
-
List<Project> selections = new ArrayList<>();
if (getModelObject() != null) {
ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
for (String projectName: getModelObject()) {
Project project = projectManager.find(projectName);
- if (project != null && choices.contains(project))
+ if (project != null && choicesModel.getObject().contains(project))
selections.add(project);
}
}
- input = new ProjectMultiChoice("input", Model.of(selections), new ProjectChoiceProvider(choices)) {
+ input = new ProjectMultiChoice("input", Model.of(selections), new ProjectChoiceProvider(choicesModel)) {
@Override
protected void onInitialize() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java
index 596d65d129..c6cfc1bd61 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/project/choice/ProjectSingleChoiceEditor.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.editable.project.choice;
-import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -20,8 +20,6 @@ import io.onedev.server.web.editable.PropertyEditor;
@SuppressWarnings("serial")
public class ProjectSingleChoiceEditor extends PropertyEditor<String> {
- private final List<Project> choices = new ArrayList<>();
-
private ProjectSingleChoice input;
public ProjectSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor,
@@ -33,7 +31,8 @@ public class ProjectSingleChoiceEditor extends PropertyEditor<String> {
protected void onInitialize() {
super.onInitialize();
- choices.addAll(OneDev.getInstance(ProjectManager.class).query());
+ List<Project> projects = OneDev.getInstance(ProjectManager.class).query();
+ projects.sort(Comparator.comparing(Project::getName));
Project project;
if (getModelObject() != null)
@@ -42,12 +41,12 @@ public class ProjectSingleChoiceEditor extends PropertyEditor<String> {
project = null;
Project selection;
- if (project != null && choices.contains(project))
+ if (project != null && projects.contains(project))
selection = project;
else
selection = null;
- input = new ProjectSingleChoice("input", Model.of(selection), new ProjectChoiceProvider(choices)) {
+ input = new ProjectSingleChoice("input", Model.of(selection), new ProjectChoiceProvider(Model.of(projects))) {
@Override
protected void onInitialize() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java
index b73268de69..1b721aec1b 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java
@@ -51,7 +51,7 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {
.invokeStaticMethod(descriptor.getBeanClass(), userChoice.value()));
} else {
choices.addAll(OneDev.getInstance(UserManager.class).query());
- choices.sort(Comparator.comparing(User::getName));
+ choices.sort(Comparator.comparing(User::getDisplayName));
}
} finally {
ComponentContext.pop();
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java
index 170581e0cf..e9bb599c00 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java
@@ -49,7 +49,7 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {
.invokeStaticMethod(descriptor.getBeanClass(), userChoice.value()));
} else {
choices.addAll(OneDev.getInstance(UserManager.class).query());
- choices.sort(Comparator.comparing(User::getName));
+ choices.sort(Comparator.comparing(User::getDisplayName));
}
} finally {
ComponentContext.pop();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
index 795b443f3a..b47194918b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
@@ -1,3 +1,2 @@
<wicket:extend>
- <a wicket:id="test">test</a>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 716ba306f3..066be5dd6a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -3,7 +3,6 @@ package io.onedev.server.web.page.test;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.web.page.base.BasePage;
@@ -18,16 +17,8 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
-
- add(new Link<Void>("test") {
-
- @Override
- public void onClick() {
- }
-
- });
}
-
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);