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

ActivityService: minor template fix for unit tests

Browse Source 
- may also fix ALF-7444 - found whilst investigating CLOUD-1347 (FeedNotifier.testFailedNotifications)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46715 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2013-02-15 18:40:11 +00:00
parent a625d87120
commit 4c393ef70f
8 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/templates/activities-email-templates/activities-email.ftl
View File

@@ -89,7 +89,7 @@
<#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!""> <#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!"">
<div class="activity"> <div class="activity">
<#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)}</#if> <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)!""}</#if>
</div> </div>
<div style="font-size: 11px; padding: 4px 0px 12px 0px;"> <div style="font-size: 11px; padding: 4px 0px 12px 0px;">
${activity.postDate?datetime?string.medium} ${activity.postDate?datetime?string.medium}

2
config/alfresco/templates/activities-email-templates/activities-email_de.ftl
View File

@@ -89,7 +89,7 @@
<#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!""> <#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!"">
<div class="activity"> <div class="activity">
<#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)}</#if> <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)!""}</#if>
</div> </div>
<div style="font-size: 11px; padding: 4px 0px 12px 0px;"> <div style="font-size: 11px; padding: 4px 0px 12px 0px;">
${activity.postDate?datetime?string.medium} ${activity.postDate?datetime?string.medium}

2
config/alfresco/templates/activities-email-templates/activities-email_es.ftl
View File

@@ -89,7 +89,7 @@
<#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!""> <#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!"">
<div class="activity"> <div class="activity">
<#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)}</#if> <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)!""}</#if>
</div> </div>
<div style="font-size: 11px; padding: 4px 0px 12px 0px;"> <div style="font-size: 11px; padding: 4px 0px 12px 0px;">
${activity.postDate?datetime?string.medium} ${activity.postDate?datetime?string.medium}

2
config/alfresco/templates/activities-email-templates/activities-email_fr.ftl
View File

@@ -89,7 +89,7 @@
<#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!""> <#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!"">
<div class="activity"> <div class="activity">
<#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)}</#if> <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)!""}</#if>
</div> </div>
<div style="font-size: 11px; padding: 4px 0px 12px 0px;"> <div style="font-size: 11px; padding: 4px 0px 12px 0px;">
${activity.postDate?datetime?string.medium} ${activity.postDate?datetime?string.medium}

2
config/alfresco/templates/activities-email-templates/activities-email_it.ftl
View File

@@ -89,7 +89,7 @@
<#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!""> <#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!"">
<div class="activity"> <div class="activity">
<#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)}</#if> <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)!""}</#if>
</div> </div>
<div style="font-size: 11px; padding: 4px 0px 12px 0px;"> <div style="font-size: 11px; padding: 4px 0px 12px 0px;">
${activity.postDate?datetime?string.medium} ${activity.postDate?datetime?string.medium}

2
config/alfresco/templates/activities-email-templates/activities-email_ja.ftl
View File

@@ -89,7 +89,7 @@
<#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!""> <#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!"">
<div class="activity"> <div class="activity">
<#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)}</#if> <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)!""}</#if>
</div> </div>
<div style="font-size: 11px; padding: 4px 0px 12px 0px;"> <div style="font-size: 11px; padding: 4px 0px 12px 0px;">
${activity.postDate?datetime?string.medium} ${activity.postDate?datetime?string.medium}

2
config/alfresco/templates/activities-email-templates/activities-email_nl.ftl
View File

@@ -89,7 +89,7 @@
<#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!""> <#assign detail=message(activity.activityType?html, itemLink, userLink, custom0, activity.activitySummary.custom1!"", siteLink, secondUserLink)!"">
<div class="activity"> <div class="activity">
<#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)}</#if> <#if suppressSite>${detail}<#else>${message("in.site", detail, siteLink)!""}</#if>
</div> </div>
<div style="font-size: 11px; padding: 4px 0px 12px 0px;"> <div style="font-size: 11px; padding: 4px 0px 12px 0px;">
${activity.postDate?datetime?string.medium} ${activity.postDate?datetime?string.medium}

5
source/java/org/alfresco/repo/domain/activities/ActivityPostEntity.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2012 Alfresco Software Limited. * Copyright (C) 2005-2013 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -20,6 +20,7 @@ package org.alfresco.repo.domain.activities;
import java.util.Date; import java.util.Date;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
/** /**
@@ -41,7 +42,7 @@ public class ActivityPostEntity
private Date lastModified; // for debug private Date lastModified; // for debug
// derived // derived
private String tenantDomain; private String tenantDomain = TenantService.DEFAULT_DOMAIN;
private NodeRef parentNodeRef; private NodeRef parentNodeRef;
// for selector // for selector