From 763ffd0a25516c098f2f032246dc28993954b1a7 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 17 Jan 2017 11:33:15 +0100 Subject: [server] Fix wrong mail template parameter names (currently unused code path though) --- .../main/java/org/openslx/bwlp/sat/mail/MailGenerator.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'dozentenmodulserver/src/main/java') diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailGenerator.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailGenerator.java index 1fa2b717..898574b8 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailGenerator.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailGenerator.java @@ -156,10 +156,10 @@ public class MailGenerator { } templateArgs.put("image", image.imageName); templateArgs.put("uploader", uploaderName); - templateArgs.put("new.created", Formatter.date(newVersion.createTime)); + templateArgs.put("new_created", Formatter.date(newVersion.createTime)); if (oldVersion != null) { - templateArgs.put("old.created", Formatter.date(oldVersion.createTime)); + templateArgs.put("old_created", Formatter.date(oldVersion.createTime)); } } @@ -183,20 +183,20 @@ public class MailGenerator { || image.latestVersionId.equals(version.imageVersionId); MailTemplate template; - Map templateArgs = new HashMap<>(); - templateArgs.put("image", image.imageName); - templateArgs.put("remaining_days", String.valueOf(days)); - templateArgs.put("created", Formatter.date(version.createTime)); if (isCurrentlyLatest) { template = DbConfiguration.getMailTemplate(Template.VM_CURRENT_VERSION_EXPIRING); } else if (mailForced) { - template = DbConfiguration.getMailTemplate(Template.VM_OLD_VERSION_EXPIRING); + template = DbConfiguration.getMailTemplate(Template.VM_OLD_VERSION_EXPIRING); } else { return; } List relevantUsers; // Mail users responsible for this image + Map templateArgs = new HashMap<>(); + templateArgs.put("image", image.imageName); + templateArgs.put("remaining_days", String.valueOf(days)); + templateArgs.put("created", Formatter.date(version.createTime)); String message = wordWrap(template.format(templateArgs)); relevantUsers = getUserToMail(image); for (UserInfo user : relevantUsers) { -- cgit v1.2.3-55-g7522