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

RM-1575: Missing information from Hold Report

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@75198 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2014-06-30 09:56:38 +00:00
parent e72231f8a5
commit 11b47d9ad2
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rm-server/config/alfresco/module/org_alfresco_module_rm/bootstrap/report/report_rmr_holdReport.html.ftl
View File

@@ -57,6 +57,14 @@
<td><i>${message("file.report.hold.reason")}:</i></td> <td><i>${message("file.report.hold.reason")}:</i></td>
<td>${node.properties["rma:holdReason"]}</td> <td>${node.properties["rma:holdReason"]}</td>
</tr> </tr>
<tr>
<td><i>${message("file.report.createdby")}:</i></td>
<td>${reportUser}</td>
</tr>
<tr>
<td><i>${message("file.report.createdon")}:</i></td>
<td>${reportDate}</td>
</tr>
</table> </table>
<#if node.childAssociations["rma:frozenRecords"]??> <#if node.childAssociations["rma:frozenRecords"]??>
<div style="font-size: 14px; margin: 12px 0px 24px 0px; padding-top: 10px; border-top: 1px solid #aaaaaa;"> <div style="font-size: 14px; margin: 12px 0px 24px 0px; padding-top: 10px; border-top: 1px solid #aaaaaa;">

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

@@ -23,3 +23,5 @@ file.report.hold.name=Hold Name
file.report.hold.description=Hold Description file.report.hold.description=Hold Description
file.report.hold.reason=Hold Reason file.report.hold.reason=Hold Reason
file.report.hold.held=Held file.report.hold.held=Held
file.report.createdby=Created By
file.report.createdon=Created On

8
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/report/generator/DeclarativeReportGenerator.java
View File

@@ -19,6 +19,8 @@
package org.alfresco.module.org_alfresco_module_rm.report.generator; package org.alfresco.module.org_alfresco_module_rm.report.generator;
import java.io.Serializable; import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -29,6 +31,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.admin.SysAdminParams; import org.alfresco.repo.admin.SysAdminParams;
import org.alfresco.repo.i18n.StaticMessageLookup; import org.alfresco.repo.i18n.StaticMessageLookup;
import org.alfresco.repo.model.Repository; import org.alfresco.repo.model.Repository;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.TypeDefinition; import org.alfresco.service.cmr.dictionary.TypeDefinition;
import org.alfresco.service.cmr.model.FileFolderService; import org.alfresco.service.cmr.model.FileFolderService;
@@ -256,6 +259,11 @@ public class DeclarativeReportGenerator extends BaseReportGenerator
model.put("url", UrlUtil.getAlfrescoUrl(sysAdminParams)); model.put("url", UrlUtil.getAlfrescoUrl(sysAdminParams));
model.put(TemplateService.KEY_SHARE_URL, UrlUtil.getShareUrl(sysAdminParams)); model.put(TemplateService.KEY_SHARE_URL, UrlUtil.getShareUrl(sysAdminParams));
// who and when the report was generated
model.put("reportUser", AuthenticationUtil.getRunAsUser());
Calendar now = Calendar.getInstance(I18NUtil.getContentLocale());
model.put("reportDate", SimpleDateFormat.getDateInstance(SimpleDateFormat.MEDIUM).format(now.getTime()));
// add additional properties // add additional properties
model.put("properties", (Serializable) properties); model.put("properties", (Serializable) properties);