diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_ja.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_ja.properties
index b79d84f3da..a4a82172d9 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_ja.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_ja.properties
@@ -1,6 +1,6 @@
# File Report Template
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.on=\u30aa\u30f3
file.report.destroyed=\u7834\u68c4\u6e08\u307f
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_nb.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_nb.properties
index 518321dece..65d0099313 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_nb.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_nb.properties
@@ -1,6 +1,6 @@
# File Report Template
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.on=p\u00e5
file.report.destroyed=Destruert
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
index f75f4a4ca8..482e854cff 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
@@ -731,6 +731,7 @@
+
@@ -844,9 +845,9 @@
-
+
-
+
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java
index ca86e30a5b..c38636c8ff 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/extractor/FilePlanNamePathDataExtractor.java
@@ -77,25 +77,19 @@ public final class FilePlanNamePathDataExtractor extends AbstractDataExtractor
*/
public Serializable extractData(Serializable value)
{
- String extractedData = null;
-
NodeRef nodeRef = (NodeRef) value;
- if (nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT))
+
+ // Get path from the RM root
+ List nodeRefPath = filePlanService.getNodeRefPath(nodeRef);
+
+ StringBuilder sb = new StringBuilder(128);
+ for (NodeRef pathNodeRef : nodeRefPath)
{
- // Get path from the RM root
- List nodeRefPath = filePlanService.getNodeRefPath(nodeRef);
-
- 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();
+ String name = (String)nodeService.getProperty(pathNodeRef, ContentModel.PROP_NAME);
+ sb.append("/").append(name);
}
- return extractedData;
+ // Done
+ return sb.toString();
}
}