Skip to content
Snippets Groups Projects
Commit d3496924 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

sort templates in template groups naturally

parent 25d514fb
Branches
Tags
No related merge requests found
......@@ -118,11 +118,18 @@ public class TemplateGroupService implements Resettable, AccessAllEntities<Templ
for(TemplateGroup templateGroup : templateGroups)
{
templatesGrouped.put(templateGroup, templateGroup.getReferringTemplates());
templatesGrouped.put(templateGroup, getReferringTemplatesSorted(templateGroup));
}
templatesGrouped.put(defaultGroup, defaultGroup.getReferringTemplates());
templatesGrouped.put(defaultGroup, getReferringTemplatesSorted(defaultGroup));
return templatesGrouped;
}
private List<Template> getReferringTemplatesSorted(TemplateGroup templateGroup)
{
final List<Template> referringTemplates = new ArrayList<>(templateGroup.getReferringTemplates());
referringTemplates.sort((t1, t2) -> new NaturalOrderComparator().compare(t1.getTemplateName(), t2.getTemplateName()));
return referringTemplates;
}
}
......@@ -74,7 +74,7 @@ class TemplateGroupServiceTest
final Map<TemplateGroup, List<Template>> templatesGrouped = templateGroupService.getTemplatesByGroupedByTemplateGroup();
assertThat(templatesGrouped).hasSize(3)
.containsExactly(entry(templateGroup1, List.of(template1, template4)),
.containsExactly(entry(templateGroup1, List.of(template4, template1)),
entry(templateGroup2, List.of(template3)),
entry(templateGroupDefault, List.of(template2)));
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment