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

Merged BRANCHES/V2.3 to HEAD:

Browse Source 
97592: RM-1967 (Incorrect message is shown when declare version as record)
   97595: RM-1903 (Can't manage permissions without "Manage Access Controls" capability)
   97600: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
        97533: RM-1586 - server-side fix for legacy custom property names that might contain spaces
   97603: RM-1949 (Details page is displayed incorrect after link to rule set)
   97657: RM-1969 (Changing a linked rule set displays the wrong rule picker dialog)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@97673 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2015-02-20 21:39:50 +00:00
parent babd58bff8 cc7243370e
commit b6fa34db22
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionPut.java
View File

@@ -34,6 +34,7 @@ import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import org.json.JSONTokener; import org.json.JSONTokener;
import org.springframework.extensions.surf.util.ParameterCheck; import org.springframework.extensions.surf.util.ParameterCheck;
import org.springframework.extensions.surf.util.URLEncoder;
import org.springframework.extensions.webscripts.Cache; import org.springframework.extensions.webscripts.Cache;
import org.springframework.extensions.webscripts.Status; import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.WebScriptException; import org.springframework.extensions.webscripts.WebScriptException;
@@ -133,7 +134,7 @@ public class CustomPropertyDefinitionPut extends BaseCustomPropertyWebScript
String propId = (String)params.get(PROP_ID); String propId = (String)params.get(PROP_ID);
ParameterCheck.mandatoryString("propId", propId); ParameterCheck.mandatoryString("propId", propId);
QName propQName = rmAdminService.getQNameForClientId(propId); QName propQName = rmAdminService.getQNameForClientId(URLEncoder.encode(propId));
if (propQName == null) if (propQName == null)
{ {
throw new WebScriptException(Status.STATUS_NOT_FOUND, throw new WebScriptException(Status.STATUS_NOT_FOUND,