From 3e63485907dd87df0ab1bf3471ae04c21411160c Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 9 Feb 2015 10:17:39 +0000
Subject: [PATCH 1/2] RM-1867 (Reject rule works incorrect if set up in File
 Plan)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@96524 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../rm-action-context.xml                     |  5 ++--
 .../FilePlanNamePathDataExtractor.java        | 26 +++++++------------
 2 files changed, 13 insertions(+), 18 deletions(-)

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 @@
 
    <bean id="reject" class="org.alfresco.module.org_alfresco_module_rm.action.impl.RejectAction" parent="rmAction">
       <property name="publicAction" value="true"/>
+      <property name="auditedImmediately" value="true" />
    </bean>
 
    <!--  File To -->
@@ -844,9 +845,9 @@
       <property name="publicAction" value="true"/>
       <property name="allowParameterSubstitutions" value="true"/>
    </bean>
-   
+
    <!--  Unlink Record -->
-   
+
    <bean id="unlinkFrom_proxy" parent="rmProxyAction">
       <property name="target" ref="unlinkFrom"/>
         <property name="interceptorNames">
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<NodeRef> nodeRefPath = filePlanService.getNodeRefPath(nodeRef);
+
+        StringBuilder sb = new StringBuilder(128);
+        for (NodeRef pathNodeRef : nodeRefPath)
         {
-            // Get path from the RM root
-            List<NodeRef> 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();
     }
 }

From 16b80000c1cc7edf10b515d5c08100fc3f85ba08 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 9 Feb 2015 15:52:27 +0000
Subject: [PATCH 2/2] RM-1906 (The file report action is not working for
 transferred folders and files in norwegian)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@96562 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org_alfresco_module_rm/messages/template_ja.properties      | 2 +-
 .../org_alfresco_module_rm/messages/template_nb.properties      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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