Més correccions

Author: toniprieto

dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java

@@ -637,9 +637,9 @@ public String createLocationQueryForAdministrableDSOs(String epersonAndGroupClau
                     }
                 }
                 if (!containerUUIDs.isEmpty()) {
-                    locationQuery.append("location:(");
-                    locationQuery.append(String.join(" OR ", containerUUIDs));
-                    return locationQuery.append(")").toString();
+                    locationQuery.append("({!terms f=location}");
+                    locationQuery.append(String.join(",", containerUUIDs)).append(")");
+                    return locationQuery.toString();
                 }
             }
         } catch (Exception e) {

dspace-api/src/main/java/org/dspace/discovery/SolrServiceResourceRestrictionPlugin.java

@@ -151,23 +151,23 @@ public void additionalSearchParameters(Context context, DiscoverQuery discoveryQ
                  */
                 if (actions.isEmpty()) {
                     // If no actions are included, we only check for read permissions
-                    resourceQuery.append("{!terms f=read}").append(epersonAndGroupClause).append( " OR ")
-                        .append("{!terms f=admin}").append(epersonAndGroupClause);
+                    resourceQuery.append("({!terms f=read}").append(epersonAndGroupClause).append( ") OR (")
+                        .append("{!terms f=admin}").append(epersonAndGroupClause).append(")");
                 } else if (actions.contains(Constants.ADMIN)) {
                     // If the actions array contains the admin action, we only check for admin permissions
-                    resourceQuery.append("{!terms f=admin}").append(epersonAndGroupClause);
+                    resourceQuery.append("({!terms f=admin}").append(epersonAndGroupClause).append(")");
                 } else {
                     // If the actions array contains other actions, we check for read permissions and the actions passed
                     resourceQuery.append("(");
-                    resourceQuery.append("{!terms f=read}").append(epersonAndGroupClause);
+                    resourceQuery.append("({!terms f=read}").append(epersonAndGroupClause);
                     for (int action : actions) {
                         String actionName = getIndexedActionName(action);
-                        resourceQuery.append(" AND ").append("{!terms f=").append(actionName).append("}")
-                            .append(epersonAndGroupClause);
+                        resourceQuery.append(") AND (").append("{!terms f=").append(actionName).append("}")
+                            .append(epersonAndGroupClause).append(")");
                     }
                     resourceQuery.append(")");
-                    resourceQuery.append(" OR ").append("{!terms f=admin}")
-                        .append(epersonAndGroupClause);
+                    resourceQuery.append(" OR (").append("{!terms f=admin}")
+                        .append(epersonAndGroupClause).append(")");
                 }
 
                 // Add to the query the locations the user has administrative rights on to cover the cases of