hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-16 22:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove statusFilter added to Solr browse indexes queries to solve an issue with the local administrators navigation

Browse Source
This commit is contained in:
Toni Prieto
2023-02-01 17:25:42 +01:00
parent 8b739d4b30
commit 7267e151cf
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dspace-api/src/main/java/org/dspace/browse/SolrBrowseDAO.java
View File

@@ -8,7 +8,6 @@
package org.dspace.browse; package org.dspace.browse;
import java.io.Serializable; import java.io.Serializable;
import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
@@ -179,7 +178,6 @@ public class SolrBrowseDAO implements BrowseDAO {
DiscoverQuery query = new DiscoverQuery(); DiscoverQuery query = new DiscoverQuery();
addLocationScopeFilter(query); addLocationScopeFilter(query);
addDefaultFilterQueries(query); addDefaultFilterQueries(query);
addStatusFilter(query);
if (distinct) { if (distinct) {
DiscoverFacetField dff; DiscoverFacetField dff;
if (StringUtils.isNotBlank(startsWith)) { if (StringUtils.isNotBlank(startsWith)) {
@@ -230,18 +228,6 @@ public class SolrBrowseDAO implements BrowseDAO {
return sResponse; return sResponse;
} }
private void addStatusFilter(DiscoverQuery query) {
try {
if (!authorizeService.isAdmin(context)
&& (authorizeService.isCommunityAdmin(context)
|| authorizeService.isCollectionAdmin(context))) {
query.addFilterQueries(searcher.createLocationQueryForAdministrableItems(context));
}
} catch (SQLException ex) {
log.error("Error looking up authorization rights of current user", ex);
}
}
private void addLocationScopeFilter(DiscoverQuery query) { private void addLocationScopeFilter(DiscoverQuery query) {
if (container != null) { if (container != null) {
if (containerIDField.startsWith("collection")) { if (containerIDField.startsWith("collection")) {
@@ -346,7 +332,6 @@ public class SolrBrowseDAO implements BrowseDAO {
DiscoverQuery query = new DiscoverQuery(); DiscoverQuery query = new DiscoverQuery();
addLocationScopeFilter(query); addLocationScopeFilter(query);
addDefaultFilterQueries(query); addDefaultFilterQueries(query);
addStatusFilter(query);
query.setMaxResults(0); query.setMaxResults(0);
query.addFilterQueries("search.resourcetype:" + IndexableItem.TYPE); query.addFilterQueries("search.resourcetype:" + IndexableItem.TYPE);