Mercurial > gemma
changeset 2896:a1320a9696fa
merge
| author | Bernhard Reiter <bernhard@intevation.de> |
|---|---|
| date | Tue, 02 Apr 2019 13:00:18 +0200 |
| parents | 95e40c87a943 (current diff) 92812bf2f008 (diff) |
| children | b7cfbb21f252 |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/controllers/user.go Tue Apr 02 12:17:52 2019 +0200 +++ b/pkg/controllers/user.go Tue Apr 02 13:00:18 2019 +0200 @@ -403,10 +403,10 @@ var bodyTmpl *template.Template if userData.Role == "sys_admin" { - subject = "Sysadmin Notification TEST" + subject = "Gemma: Sysadmin Notification TEST" bodyTmpl = testSysadminNotifyMailTmpl } else if userData.Role == "waterway_admin" { - subject = "Waterway Admin Notification TEST" + subject = "Gemma: Waterway Admin Notification TEST" bodyTmpl = testWWAdminNotifyMailTmpl } else { err = JSONError{
--- a/pkg/imports/email.go Tue Apr 02 12:17:52 2019 +0200 +++ b/pkg/imports/email.go Tue Apr 02 13:00:18 2019 +0200 @@ -28,7 +28,7 @@ const ( selectEmailSQL = `SELECT email_address FROM users.list_users WHERE username = $1` - importNotificationMailSubject = `import notification mail` + importNotificationMailSubject = `Gemma: import notification mail` ) var ( @@ -38,11 +38,11 @@ a {{ .Description }} import on server {{ .Server }} triggered this email notification. -{{ if eq .State "accepted" }}The imported data were successfully integrated into the database.{{ end -}} -{{ if eq .State "unchanged" }}The import has not changed any data in the database.{{ end -}} -{{ if eq .State "failed" }}The import failed for some reasons.{{ end -}} +{{ if eq .State "accepted" }}The imported data were successfully integrated into the database. {{ end -}} +{{ if eq .State "unchanged" }}The import has not changed any data in the database. {{ end -}} +{{ if eq .State "failed" }}The import failed for some reasons. {{ end -}} {{ if eq .State "pending" }}The imported data could be integrated into the database -but your final decision is needed.{{ end -}} +but your final decision is needed. {{ end -}} Please follow this link to have a closer look at the details: