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

RM-971: Non-electronic record properties shouldn't be displayed in 'Content' properties section

Browse Source 
* users with EditNonRecordMetaData capability can now edit the non-electronic content properties



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@75192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2014-06-29 23:07:51 +00:00
parent 63d0b4732e
commit 42b84fea9e
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
View File

@@ -153,7 +153,6 @@ public class RecordServiceImpl extends BaseBehaviourBean
NamespaceService.FORUMS_MODEL_1_0_URI, NamespaceService.FORUMS_MODEL_1_0_URI,
NamespaceService.LINKS_MODEL_1_0_URI, NamespaceService.LINKS_MODEL_1_0_URI,
NamespaceService.REPOSITORY_VIEW_1_0_URI NamespaceService.REPOSITORY_VIEW_1_0_URI
}; };
/** Indentity service */ /** Indentity service */
@@ -1269,7 +1268,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
else if (allowNonRecordEdit && !allowRecordEdit) else if (allowNonRecordEdit && !allowRecordEdit)
{ {
// can only edit non record properties // can only edit non record properties
if (!isRecordMetadata(property)) if (!isRecordMetadata(filePlan, property))
{ {
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
@@ -1289,7 +1288,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
else if (!allowNonRecordEdit && allowRecordEdit) else if (!allowNonRecordEdit && allowRecordEdit)
{ {
// can only edit record properties // can only edit record properties
if (isRecordMetadata(property)) if (isRecordMetadata(filePlan, property))
{ {
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
@@ -1317,19 +1316,35 @@ public class RecordServiceImpl extends BaseBehaviourBean
* @param property property * @param property property
* @return boolea true if record metadata, false otherwise * @return boolea true if record metadata, false otherwise
*/ */
private boolean isRecordMetadata(QName property) private boolean isRecordMetadata(NodeRef filePlan, QName property)
{ {
boolean result = ArrayUtils.contains(RECORD_MODEL_URIS, property.getNamespaceURI()); boolean result = false;
if (!result && !ArrayUtils.contains(NON_RECORD_MODEL_URIS, property.getNamespaceURI())) // grab the information about the properties parent type
{ ClassDefinition parent = null;
PropertyDefinition def = dictionaryService.getProperty(property); PropertyDefinition def = dictionaryService.getProperty(property);
if (def != null) if (def != null)
{ {
ClassDefinition parent = def.getContainerClass(); parent = def.getContainerClass();
}
// non-electronic record is considered a special case
// TODO move non-electronic record support to a separate model namespace
if (parent != null && TYPE_NON_ELECTRONIC_DOCUMENT.equals(parent.getName()))
{
result = false;
}
else
{
// check the URI's
result = ArrayUtils.contains(RECORD_MODEL_URIS, property.getNamespaceURI());
// check the custom model
if (!result && !ArrayUtils.contains(NON_RECORD_MODEL_URIS, property.getNamespaceURI()))
{
if (parent != null && parent.isAspect()) if (parent != null && parent.isAspect())
{ {
result = getRecordMetaDataAspects().contains(parent.getName()); result = getRecordMetadataAspects(filePlan).contains(parent.getName());
} }
} }
} }