Skip to content

Commit 6210e73

Browse files
committed
Fallback to email template in Default tenant if it is not fiound in the
current one
1 parent c767403 commit 6210e73

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

logicaldoc-core/src/main/java/com/logicaldoc/core/communication/EMailSender.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import com.logicaldoc.core.folder.FolderDAO;
5555
import com.logicaldoc.core.metadata.Attribute;
5656
import com.logicaldoc.core.metadata.TemplateDAO;
57+
import com.logicaldoc.core.security.Tenant;
5758
import com.logicaldoc.core.security.TenantDAO;
5859
import com.logicaldoc.core.security.user.UserDAO;
5960
import com.logicaldoc.core.threading.ThreadPools;
@@ -266,6 +267,8 @@ public void send(EMail email, String templateName, Map<String, Object> dictionar
266267
try {
267268
template = templateDao.findByNameAndLanguage(templateName, email.getLocale().toString(),
268269
email.getTenantId());
270+
if (template == null)
271+
templateDao.findByNameAndLanguage(templateName, email.getLocale().toString(), Tenant.DEFAULT_ID);
269272
} catch (PersistenceException e) {
270273
log.error(e.getMessage(), e);
271274
}
@@ -310,7 +313,7 @@ public void send(EMail email) throws MessagingException {
310313
log.error("Aspect sendingMessages not enabled");
311314
return;
312315
}
313-
316+
314317
cleanAuthorAddress(email);
315318

316319
Session session = newMailSession();

0 commit comments

Comments
 (0)