From 7678d9ec709526440626dc89699a021af9f9a839 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Fri, 22 Jun 2018 08:32:24 +0200
Subject: [PATCH] OO-3550: don't filter mail in outbox
---
.../core/gui/components/stack/TooledStackedPanelRenderer.java | 1 -
.../java/org/olat/core/util/mail/manager/MailManagerImpl.java | 2 +-
.../java/org/olat/user/manager/UserDataExportServiceImpl.java | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/core/gui/components/stack/TooledStackedPanelRenderer.java b/src/main/java/org/olat/core/gui/components/stack/TooledStackedPanelRenderer.java
index 8052a10d33a..a2f238e41b8 100644
--- a/src/main/java/org/olat/core/gui/components/stack/TooledStackedPanelRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/stack/TooledStackedPanelRenderer.java
@@ -84,7 +84,6 @@ public class TooledStackedPanelRenderer extends DefaultComponentRenderer {
sb.append("</ol></div>"); // o_breadcrumb
}
- System.out.println(panel.isToolbarAutoEnabled() + " " + panel.isToolbarEnabled());
if (panel.isToolbarAutoEnabled() || panel.isToolbarEnabled()) {
List<Tool> leftTools = getTools(tools, Align.left);
List<Tool> rightEdgeTools = getTools(tools, Align.rightEdge);
diff --git a/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java b/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java
index e5274f4c048..840ae32bf67 100644
--- a/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java
+++ b/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java
@@ -521,7 +521,7 @@ public class MailManagerImpl implements MailManager, InitializingBean {
.append(" inner join fromRecipient.recipient fromRecipientIdentity")
.append(" inner join ").append(fetchRecipients ? "fetch" : "").append(" mail.recipients recipient")
.append(" inner join ").append(fetchRecipients ? "fetch" : "").append(" recipient.recipient recipientIdentity")
- .append(" where fromRecipientIdentity.key=:fromKey and fromRecipient.deleted=false and recipientIdentity.key!=:fromKey")
+ .append(" where fromRecipientIdentity.key=:fromKey and fromRecipient.deleted=false ")
.append(" order by mail.creationDate desc");
TypedQuery<DBMailLight> query = dbInstance.getCurrentEntityManager()
diff --git a/src/main/java/org/olat/user/manager/UserDataExportServiceImpl.java b/src/main/java/org/olat/user/manager/UserDataExportServiceImpl.java
index b9994ec21cc..a404dd301cf 100644
--- a/src/main/java/org/olat/user/manager/UserDataExportServiceImpl.java
+++ b/src/main/java/org/olat/user/manager/UserDataExportServiceImpl.java
@@ -223,7 +223,7 @@ public class UserDataExportServiceImpl implements UserDataExportService {
vContext.put("url", url);
}
};
- MailBundle bundle = mailService.makeMailBundle(new MailContextImpl(), dataExport.getRequestBy(), template, dataExport.getRequestBy(), null, result);
+ MailBundle bundle = mailService.makeMailBundle(new MailContextImpl(), dataExport.getRequestBy(), template, null, null, result);
if(bundle != null) {
mailService.sendMessage(bundle);
}
--
GitLab