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

Addressing review comments from RM-132. Original issues were RM-2431 and RM-2432.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@108993 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Neil McErlean
2015-07-25 07:24:34 +00:00
parent 33b6dd5c9e
commit 7322da8f66
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-server/config/alfresco/module/org_alfresco_module_rm/model/classifiedContentModel.xml
View File

@@ -138,7 +138,7 @@
</property>
<property name="clf:lastReclassifyBy">
<title>Last user to reclassify this node</title>
<description>Identifier for the user who most recently reclassified this node</description>
<description>Free form text identifier for the user or entity who most recently reclassified this node</description>
<type>d:text</type>
<mandatory>false</mandatory>
</property>

4
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeService.java
View File

@@ -89,6 +89,10 @@ public interface ClassificationSchemeService
*/
Reclassification getReclassification(ClassificationLevel from, ClassificationLevel to);
/**
* Gets the allowed values for reclassification actions.
* @see Reclassification
*/
Set<String> getReclassificationValues();
/** Types of reclassification. */

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSchemeServiceImpl.java
View File

@@ -142,7 +142,7 @@ public class ClassificationSchemeServiceImpl extends ServiceBaseImpl implements
if (from.equals(to))
{ return null; }
else if (fromIndex < lastIndex && toIndex == lastIndex)
else if (toIndex == lastIndex)
{
return Reclassification.DECLASSIFY;
}

4
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/model/ClassifiedContentModel.java
View File

@@ -58,10 +58,6 @@ public interface ClassifiedContentModel
QName PROP_LAST_RECLASSIFY_AT = QName.createQName(CLF_URI, "lastReclassifyAt");
QName PROP_LAST_RECLASSIFY_REASON = QName.createQName(CLF_URI, "lastReclassifyReason");
QName PROP_LAST_RECLASSIFICATION_ACTION = QName.createQName(CLF_URI, "lastReclassificationAction");
/** Reclassification allowed values. */
String RECLASSIFICATION_UPGRADE = "UPGRADE";
String RECLASSIFICATION_DOWNGRADE = "DOWNGRADE";
String RECLASSIFICATION_DECLASSIFY = "DECLASSIFY";
/** Security Clearance aspect. */
QName ASPECT_SECURITY_CLEARANCE = QName.createQName(CLF_URI, "securityClearance");