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

RM-735 (DOD Recert: Bugs on the "Edit Custom Metadata" page)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/DODRECERT@50970 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2013-06-12 16:42:47 +00:00
parent 63b90e1558
commit 3882980ca5
2 changed files with 101 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinitions.get.json.ftl
View File

@@ -1,43 +1,43 @@
<#escape x as jsonUtils.encodeJSONString(x)> <#escape x as jsonUtils.encodeJSONString(x)>
{ {
"data": "data":
{ {
"customProperties": "customProperties":
{ {
<#list customProps as prop> <#list customProps as prop>
"${prop.name.toPrefixString()}": "${prop.name.toPrefixString()}":
{ {
"dataType": "<#if prop.dataType??>${prop.dataType.name.toPrefixString()}</#if>", "dataType": "<#if prop.dataType??>${prop.dataType.name.toPrefixString()}</#if>",
"label": "${prop.title!""}", "label": "${prop.title!""}",
"description": "${prop.description!""}", "description": "${prop.description!""}",
"mandatory": ${prop.mandatory?string}, "mandatory": ${prop.mandatory?string},
"multiValued": ${prop.multiValued?string}, "multiValued": ${prop.multiValued?string},
"defaultValue": "${prop.defaultValue!""}", "defaultValue": "${prop.defaultValue!""}",
"protected": ${prop.protected?string}, "protected": ${prop.protected?string},
"propId": "${prop.name.localName}", "propId": "${prop.name.localName}",
"constraintRefs": "constraintRefs":
[ [
<#list prop.constraints as con> <#list prop.constraints as con>
{ {
"name": "${con.constraint.shortName!""}", "name": "${con.constraint.shortName!""}",
"title": "${con.title!""}", "title": "${con.constraint.title!""}",
"type": "${con.constraint.type!""}", "type": "${con.constraint.type!""}",
"parameters": "parameters":
{ {
<#-- Basic implementation. Only providing 2 hardcoded parameters. --> <#-- Basic implementation. Only providing 2 hardcoded parameters. -->
<#assign lov = con.constraint.parameters["allowedValues"]> <#assign lov = con.constraint.parameters["allowedValues"]>
"caseSensitive": ${con.constraint.parameters["caseSensitive"]?string}, "caseSensitive": ${con.constraint.parameters["caseSensitive"]?string},
"listOfValues" : "listOfValues" :
[ [
<#list lov as val>"${val}"<#if val_has_next>,</#if></#list> <#list lov as val>"${val}"<#if val_has_next>,</#if></#list>
] ]
} }
}<#if con_has_next>,</#if> }<#if con_has_next>,</#if>
</#list> </#list>
] ]
}<#if prop_has_next>,</#if> }<#if prop_has_next>,</#if>
</#list> </#list>
} }
} }
} }
</#escape> </#escape>

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

@@ -22,24 +22,27 @@ import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List;
import java.util.Map; import java.util.Map;
import org.alfresco.module.org_alfresco_module_rm.CustomMetadataException; import org.alfresco.module.org_alfresco_module_rm.CustomMetadataException;
import org.alfresco.module.org_alfresco_module_rm.PropertyAlreadyExistsMetadataException;
import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService; import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
import org.alfresco.service.cmr.dictionary.ConstraintDefinition;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.json.JSONException;
import org.json.JSONObject;
import org.json.JSONTokener;
import org.springframework.extensions.surf.util.ParameterCheck; import org.springframework.extensions.surf.util.ParameterCheck;
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;
import org.springframework.extensions.webscripts.WebScriptRequest; import org.springframework.extensions.webscripts.WebScriptRequest;
import org.json.JSONException;
import org.json.JSONObject;
import org.json.JSONTokener;
/** /**
* Implementation for Java backed webscript to update RM custom property definitions * Implementation for Java backed webscript to update RM custom property definitions
* in the custom model. * in the custom model.
* *
* @author Neil McErlean * @author Neil McErlean
*/ */
public class CustomPropertyDefinitionPut extends BaseCustomPropertyWebScript public class CustomPropertyDefinitionPut extends BaseCustomPropertyWebScript
@@ -86,30 +89,30 @@ public class CustomPropertyDefinitionPut extends BaseCustomPropertyWebScript
throw new WebScriptException(Status.STATUS_BAD_REQUEST, throw new WebScriptException(Status.STATUS_BAD_REQUEST,
"Could not parse JSON from req.", je); "Could not parse JSON from req.", je);
} }
return ftlModel; return ftlModel;
} }
/** /**
* Applies custom properties. * Applies custom properties.
* @throws CustomMetadataException * @throws CustomMetadataException
*/ */
protected Map<String, Object> handlePropertyDefinitionUpdate(WebScriptRequest req, JSONObject json) protected Map<String, Object> handlePropertyDefinitionUpdate(WebScriptRequest req, JSONObject json)
throws JSONException, CustomMetadataException throws JSONException, CustomMetadataException
{ {
Map<String, Object> result = new HashMap<String, Object>(); Map<String, Object> result = new HashMap<String, Object>();
Map<String, Serializable> params = getParamsFromUrlAndJson(req, json); Map<String, Serializable> params = getParamsFromUrlAndJson(req, json);
QName propertyQName; QName propertyQName;
propertyQName = updatePropertyDefinition(params); propertyQName = updatePropertyDefinition(params);
String localName = propertyQName.getLocalName(); String localName = propertyQName.getLocalName();
result.put(PROP_ID, localName); result.put(PROP_ID, localName);
String urlResult = req.getServicePath(); String urlResult = req.getServicePath();
result.put(URL, urlResult); result.put(URL, urlResult);
return result; return result;
} }
@@ -117,15 +120,16 @@ public class CustomPropertyDefinitionPut extends BaseCustomPropertyWebScript
* If label has a non-null value, it is set on the property def. * If label has a non-null value, it is set on the property def.
* If constraintRef has a non-null value, it is set on this propDef. * If constraintRef has a non-null value, it is set on this propDef.
* If constraintRef has a null value, all constraints for that propDef are removed. * If constraintRef has a null value, all constraints for that propDef are removed.
* *
* @param params * @param params
* @return * @return
* @throws CustomMetadataException * @throws CustomMetadataException
*/ */
protected QName updatePropertyDefinition(Map<String, Serializable> params) throws CustomMetadataException protected QName updatePropertyDefinition(Map<String, Serializable> params) throws CustomMetadataException
{ {
QName result = null; QName result = null;
boolean updated = false;
String propId = (String)params.get(PROP_ID); String propId = (String)params.get(PROP_ID);
ParameterCheck.mandatoryString("propId", propId); ParameterCheck.mandatoryString("propId", propId);
@@ -135,45 +139,71 @@ public class CustomPropertyDefinitionPut extends BaseCustomPropertyWebScript
throw new WebScriptException(Status.STATUS_NOT_FOUND, throw new WebScriptException(Status.STATUS_NOT_FOUND,
"Could not find property definition for: " + propId); "Could not find property definition for: " + propId);
} }
if (params.containsKey(PARAM_CONSTRAINT_REF)) if (params.containsKey(PARAM_CONSTRAINT_REF))
{ {
String constraintRef = (String)params.get(PARAM_CONSTRAINT_REF); String constraintRef = (String)params.get(PARAM_CONSTRAINT_REF);
List<ConstraintDefinition> constraints = rmAdminService.getCustomPropertyDefinitions().get(propQName).getConstraints();
if (constraintRef == null)
{ if (constraintRef == null)
result = rmAdminService.removeCustomPropertyDefinitionConstraints(propQName); {
} result = rmAdminService.removeCustomPropertyDefinitionConstraints(propQName);
else updated = constraints.isEmpty() ? false : true;
{ }
QName constraintRefQName = QName.createQName(constraintRef, namespaceService); else
result = rmAdminService.setCustomPropertyDefinitionConstraint(propQName, constraintRefQName); {
} boolean exists = false;
for (ConstraintDefinition constraintDefinition : constraints)
{
if (constraintDefinition.getConstraint().getShortName().equalsIgnoreCase(constraintRef))
{
exists = true;
break;
}
}
if (exists == false)
{
QName constraintRefQName = QName.createQName(constraintRef, namespaceService);
result = rmAdminService.setCustomPropertyDefinitionConstraint(propQName, constraintRefQName);
updated = true;
}
}
} }
if (params.containsKey(PARAM_LABEL)) if (params.containsKey(PARAM_LABEL))
{ {
String label = (String)params.get(PARAM_LABEL); String label = (String)params.get(PARAM_LABEL);
result = rmAdminService.updateCustomPropertyDefinitionName(propQName, label); try
{
result = rmAdminService.updateCustomPropertyDefinitionName(propQName, label);
}
catch (PropertyAlreadyExistsMetadataException ex)
{
if (updated == false)
{
String propIdAsString = rmAdminService.getQNameForClientId(label).toPrefixString(namespaceService);
throw new PropertyAlreadyExistsMetadataException(propIdAsString);
}
}
} }
return result; return result;
} }
@SuppressWarnings("unchecked") @SuppressWarnings("rawtypes")
protected Map<String, Serializable> getParamsFromUrlAndJson(WebScriptRequest req, JSONObject json) protected Map<String, Serializable> getParamsFromUrlAndJson(WebScriptRequest req, JSONObject json)
throws JSONException throws JSONException
{ {
Map<String, Serializable> params; Map<String, Serializable> params;
params = new HashMap<String, Serializable>(); params = new HashMap<String, Serializable>();
Map<String, String> templateVars = req.getServiceMatch().getTemplateVars(); Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
String propId = templateVars.get(PROP_ID); String propId = templateVars.get(PROP_ID);
if (propId != null) if (propId != null)
{ {
params.put(PROP_ID, (Serializable)propId); params.put(PROP_ID, (Serializable)propId);
} }
for (Iterator iter = json.keys(); iter.hasNext(); ) for (Iterator iter = json.keys(); iter.hasNext(); )
{ {
String nextKeyString = (String)iter.next(); String nextKeyString = (String)iter.next();
@@ -182,10 +212,10 @@ public class CustomPropertyDefinitionPut extends BaseCustomPropertyWebScript
{ {
nextValueString = json.getString(nextKeyString); nextValueString = json.getString(nextKeyString);
} }
params.put(nextKeyString, nextValueString); params.put(nextKeyString, nextValueString);
} }
return params; return params;
} }
} }