Merge pull request #2026 from KingKrimmson/DS-3894-6_x

[DS-3894] Fix "No enum constant" exception for facet "View More" links
This commit is contained in:
kshepherd
2018-05-17 11:28:48 +12:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@@ -252,7 +252,7 @@ public class SearchFacetFilter extends AbstractDSpaceTransformer implements Cach
}
private SORT getSortOrder(Request request) {
String sortOrderString = request.getParameter("order");
String sortOrderString = request.getParameter("filterorder");
// First check for an already configured sortOrder (provided a new one is not being set)
if(sortOrder!=null && StringUtils.isBlank(sortOrderString)){
return sortOrder;
@@ -261,7 +261,7 @@ public class SearchFacetFilter extends AbstractDSpaceTransformer implements Cach
if(StringUtils.isBlank(sortOrderString) || SORT.valueOf(sortOrderString.toUpperCase())==null){
sortOrder= SORT.VALUE;
}else{
sortOrder= SORT.valueOf(request.getParameter("order").toUpperCase());
sortOrder= SORT.valueOf(request.getParameter("filterorder").toUpperCase());
}
return sortOrder;
}

View File

@@ -319,7 +319,7 @@ public class SidebarFacetsTransformer extends AbstractDSpaceTransformer implemen
facet.addItem().addXref(
contextPath +
(dso == null ? "" : "/handle/" + dso.getHandle()) +
"/search-filter?" + parameters + BrowseFacet.FACET_FIELD + "=" + field.getIndexFieldName()+"&order="+field.getSortOrderFilterPage(),
"/search-filter?" + parameters + BrowseFacet.FACET_FIELD + "=" + field.getIndexFieldName()+"&filterorder="+field.getSortOrderFilterPage(),
T_VIEW_MORE
);