inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged BRANCHES/V2.3 to HEAD:

Browse Source 
96521: RM-1683 ('Declare As Record' and 'Recorded Version Configuration' are available for documents in Repository)
   96524: RM-1867 (Reject rule works incorrect if set up in File Plan)
   96558: Slight alteration of test code in order to get better failure information from the intermittently failing test case ManageDispositionScheduleForRecord.manageDispositionScheduleForRecord.
   96560: RM-841 (Actions from Selected Items dropdown are missing)
   96562: RM-1906 (The file report action is not working for transferred folders and files in norwegian)
   96563: Reverse merged the changes for the automation project

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@96564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2015-02-09 16:30:07 +00:00
parent 366bb2d2d9 16b80000c1
commit a6423f100b
4 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_ja.properties
View File

@@ -1,6 +1,6 @@
# File Report Template # File Report Template
file.report.acession.report=\u53d7\u8afe\u30ec\u30dd\u30fc\u30c8 file.report.acession.report=\u53d7\u8afe\u30ec\u30dd\u30fc\u30c8
file.report.date.format=EEE\u5e74MMM\u6708dd\u65e5\u3001HH:mm:ss zzz yyyy file.report.date.format=EEE MMM dd HH:mm:ss zzz yyyy
file.report.declared.by=\u5ba3\u8a00\u8005 file.report.declared.by=\u5ba3\u8a00\u8005
file.report.declared.on=\u30aa\u30f3 file.report.declared.on=\u30aa\u30f3
file.report.destroyed=\u7834\u68c4\u6e08\u307f file.report.destroyed=\u7834\u68c4\u6e08\u307f

2
rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_nb.properties
View File

@@ -1,6 +1,6 @@
# File Report Template # File Report Template
file.report.acession.report=Tilgangsrapport file.report.acession.report=Tilgangsrapport
file.report.date.format=EEE MMM dd TT:mm:ss zzz \u00e5\u00e5\u00e5\u00e5 file.report.date.format=EEE MMM dd HH:mm:ss zzz yyyy
file.report.declared.by=erkl\u00e6rt av file.report.declared.by=erkl\u00e6rt av
file.report.declared.on=p\u00e5 file.report.declared.on=p\u00e5
file.report.destroyed=Destruert file.report.destroyed=Destruert

5
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
View File

@@ -731,6 +731,7 @@
<bean id="reject" class="org.alfresco.module.org_alfresco_module_rm.action.impl.RejectAction" parent="rmAction"> <bean id="reject" class="org.alfresco.module.org_alfresco_module_rm.action.impl.RejectAction" parent="rmAction">
<property name="publicAction" value="true"/> <property name="publicAction" value="true"/>
<property name="auditedImmediately" value="true" />
</bean> </bean>
<!-- File To --> <!-- File To -->
@@ -844,9 +845,9 @@
<property name="publicAction" value="true"/> <property name="publicAction" value="true"/>
<property name="allowParameterSubstitutions" value="true"/> <property name="allowParameterSubstitutions" value="true"/>
</bean> </bean>
<!-- Unlink Record --> <!-- Unlink Record -->
<bean id="unlinkFrom_proxy" parent="rmProxyAction"> <bean id="unlinkFrom_proxy" parent="rmProxyAction">
<property name="target" ref="unlinkFrom"/> <property name="target" ref="unlinkFrom"/>
<property name="interceptorNames"> <property name="interceptorNames">

26
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java
View File

@@ -77,25 +77,19 @@ public final class FilePlanNamePathDataExtractor extends AbstractDataExtractor
*/ */
public Serializable extractData(Serializable value) public Serializable extractData(Serializable value)
{ {
String extractedData = null;
NodeRef nodeRef = (NodeRef) value; NodeRef nodeRef = (NodeRef) value;
if (nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT))
// Get path from the RM root
List<NodeRef> nodeRefPath = filePlanService.getNodeRefPath(nodeRef);
StringBuilder sb = new StringBuilder(128);
for (NodeRef pathNodeRef : nodeRefPath)
{ {
// Get path from the RM root String name = (String)nodeService.getProperty(pathNodeRef, ContentModel.PROP_NAME);
List<NodeRef> nodeRefPath = filePlanService.getNodeRefPath(nodeRef); sb.append("/").append(name);
StringBuilder sb = new StringBuilder(128);
for (NodeRef pathNodeRef : nodeRefPath)
{
String name = (String)nodeService.getProperty(pathNodeRef, ContentModel.PROP_NAME);
sb.append("/").append(name);
}
// Done
extractedData = sb.toString();
} }
return extractedData; // Done
return sb.toString();
} }
} }