RM-479 (Cannot edit custom metadata)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@53755 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2013-08-07 21:44:24 +00:00
parent 03932c2240
commit 6b87c6beed
2 changed files with 8 additions and 8 deletions

View File

@@ -816,8 +816,8 @@ public class RecordsManagementAdminServiceImpl implements RecordsManagementAdmin
QName newPropQName = getQNameForClientId(newName); QName newPropQName = getQNameForClientId(newName);
if (newPropQName != null) if (newPropQName != null)
{ {
propDefn = dictionaryService.getProperty(newPropQName); PropertyDefinition newPropDefn = dictionaryService.getProperty(newPropQName);
if (propDefn != null) if (newPropDefn != null && propDefn.equals(newPropDefn) == false)
{ {
// The requested QName is already in use // The requested QName is already in use
String propIdAsString = newPropQName.toPrefixString(namespaceService); String propIdAsString = newPropQName.toPrefixString(namespaceService);

View File

@@ -205,9 +205,9 @@ public class CustomPropertyDefinitionPut extends BaseCustomPropertyWebScript
params.put(PROP_ID, (Serializable)propId); params.put(PROP_ID, (Serializable)propId);
} }
for (Iterator iter = json.keys(); iter.hasNext(); ) for (Iterator<String> iter = json.keys(); iter.hasNext(); )
{ {
String nextKeyString = (String)iter.next(); String nextKeyString = iter.next();
String nextValueString = null; String nextValueString = null;
if (!json.isNull(nextKeyString)) if (!json.isNull(nextKeyString))
{ {