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 Bugs:

Browse Source 
* legacy dod:series class causing issues on a clean install when accessing the custom properties
  * updated read me



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@34911 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2012-03-30 07:00:02 +00:00
parent 640773922a
commit 3ce8f10fc9
4 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/RecordsManagementAdminServiceImpl.java
View File

@@ -630,7 +630,11 @@ public class RecordsManagementAdminServiceImpl implements RecordsManagementAdmin
Map<QName, PropertyDefinition> result = new HashMap<QName, PropertyDefinition>();
for (QName customisableType : getCustomisable())
{
result.putAll(getCustomPropertyDefinitions(customisableType));
Map<QName, PropertyDefinition> props = getCustomPropertyDefinitions(customisableType);
if (props != null)
{
result.putAll(props);
}
}
return result;
}
@@ -640,9 +644,13 @@ public class RecordsManagementAdminServiceImpl implements RecordsManagementAdmin
*/
public Map<QName, PropertyDefinition> getCustomPropertyDefinitions(QName customisableType)
{
Map<QName, PropertyDefinition> propDefns = null;
QName relevantAspectQName = getCustomAspect(customisableType);
AspectDefinition aspectDefn = dictionaryService.getAspect(relevantAspectQName);
Map<QName, PropertyDefinition> propDefns = aspectDefn.getProperties();
if (aspectDefn != null)
{
propDefns = aspectDefn.getProperties();
}
return propDefns;
}

19
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementTypeFormFilter.java
View File

@@ -125,16 +125,19 @@ public class RecordsManagementTypeFormFilter extends RecordsManagementFormFilter
ParameterCheck.mandatory("form", form);
Map<QName, PropertyDefinition> customProps = rmAdminService.getCustomPropertyDefinitions(customisableType);
if (logger.isDebugEnabled() == true)
if (customProps != null)
{
logger.debug("Found " + customProps.size() + " custom properties for customisable type " + customisableType);
if (logger.isDebugEnabled() == true)
{
logger.debug("Found " + customProps.size() + " custom properties for customisable type " + customisableType);
}
// setup field definition for each custom property
Collection<PropertyDefinition> properties = customProps.values();
List<Field> fields = FieldUtils.makePropertyFields(properties, CUSTOM_RM_FIELD_GROUP, namespaceService);
form.addFields(fields);
}
// setup field definition for each custom property
Collection<PropertyDefinition> properties = customProps.values();
List<Field> fields = FieldUtils.makePropertyFields(properties, CUSTOM_RM_FIELD_GROUP, namespaceService);
form.addFields(fields);
}
/*

7
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomPropertyDefinitionsGet.java
View File

@@ -96,9 +96,12 @@ public class CustomPropertyDefinitionsGet extends BaseCustomPropertyWebScript
{
QName customisableType = mapToTypeQName(elementName);
Map<QName, PropertyDefinition> currentCustomProps = rmAdminService.getCustomPropertyDefinitions(customisableType);
for (Entry<QName, PropertyDefinition> entry : currentCustomProps.entrySet())
if (currentCustomProps != null)
{
propData.add(entry.getValue());
for (Entry<QName, PropertyDefinition> entry : currentCustomProps.entrySet())
{
propData.add(entry.getValue());
}
}
}
else