Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 00:15:44 +01:00
Code Issues Packages Projects Releases Activity

Sort repositories by type and name

Browse Source
This commit is contained in:
René Pfeuffer
2019-06-07 13:59:31 +02:00
parent 8a6b57e06c
commit e5809a6350
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scm-webapp/src/main/java/sonia/scm/update/MigrationWizardServlet.java
View File

@@ -18,7 +18,9 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -46,7 +48,8 @@ class MigrationWizardServlet extends HttpServlet {
@Override @Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) { protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
List<XmlRepositoryV1UpdateStep.V1Repository> repositoriesWithoutMigrationStrategies = List<XmlRepositoryV1UpdateStep.V1Repository> repositoriesWithoutMigrationStrategies =
repositoryV1UpdateStep.getRepositoriesWithoutMigrationStrategies(); new ArrayList<>(repositoryV1UpdateStep.getRepositoriesWithoutMigrationStrategies());
repositoriesWithoutMigrationStrategies.sort(Comparator.comparing(XmlRepositoryV1UpdateStep.V1Repository::getPath));
HashMap<String, Object> model = new HashMap<>(); HashMap<String, Object> model = new HashMap<>();

4
scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java
View File

@@ -240,6 +240,10 @@ public class XmlRepositoryV1UpdateStep implements UpdateStep {
return type; return type;
} }
public String getPath() {
return type + "/" + name;
}
public String getNewNamespace() { public String getNewNamespace() {
String[] nameParts = getNameParts(name); String[] nameParts = getNameParts(name);
return nameParts.length > 1 ? nameParts[0] : type; return nameParts.length > 1 ? nameParts[0] : type;

2
scm-webapp/src/main/resources/templates/repository-migration.mustache
View File

@@ -52,7 +52,7 @@
{{#repositories}} {{#repositories}}
<tr> <tr>
<td> <td>
{{type}}/{{name}} {{path}}
</td> </td>
<td> <td>
{{type}} {{type}}