diff options
| author | Simon Rettberg | 2017-01-17 11:33:15 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-01-17 11:33:15 +0100 |
| commit | 763ffd0a25516c098f2f032246dc28993954b1a7 (patch) | |
| tree | e768ed0972174893a3d19ef22a6e640c8ec82cbe /dozentenmodulserver | |
| parent | [server] Fill in image name when sending VM_DELETED_LAST_VERSION or VM_DELETE... (diff) | |
| download | tutor-module-763ffd0a25516c098f2f032246dc28993954b1a7.tar.gz tutor-module-763ffd0a25516c098f2f032246dc28993954b1a7.tar.xz tutor-module-763ffd0a25516c098f2f032246dc28993954b1a7.zip | |
[server] Fix wrong mail template parameter names (currently unused code path though)
Diffstat (limited to 'dozentenmodulserver')
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailGenerator.java | 14 |
1 files changed, 7 insertions, 7 deletions
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<String, String> 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<UserInfo> relevantUsers; // Mail users responsible for this image + Map<String, String> 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) { |