inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1290 from Alfresco/feature/APPS-591_UpdatesForACS7.0.0

Browse Source 
Feature/apps 591 updates for acs7.0.0
This commit is contained in:
Rodica Sutu
2020-12-07 09:35:57 +02:00
committed by GitHub
parent 2501cf6e00 5a6097aa83
commit d869f3c92a
9 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
View File

@@ -27,6 +27,8 @@
package org.alfresco.module.org_alfresco_module_rm.capability;
import static org.alfresco.service.cmr.search.SearchService.LANGUAGE_INDEX_SQL;
import java.util.ArrayList;
import java.util.BitSet;
import java.util.Collection;
@@ -433,7 +435,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
}
// FIXME see: RM-6895
if (returnedObject.getResultSetMetaData().getSearchParameters().getLanguage().equalsIgnoreCase("solr-sql"))
if (returnedObject.getResultSetMetaData().getSearchParameters().getLanguage().equalsIgnoreCase(LANGUAGE_INDEX_SQL))
{
return returnedObject;
}

2
rm-community/rm-community-repo/source/java/org/alfresco/util/WebScriptUtils.java
View File

@@ -238,7 +238,7 @@ public final class WebScriptUtils
try
{
value = jsonObject.getString(key);
value = jsonObject.get(key).toString();
if (checkValue && isBlank(value))
{
throw new WebScriptException(Status.STATUS_BAD_REQUEST, "The value is missing for the key '" + key + "'.");