From 2cf5e184b27fa9fd7fe29e179c160c6a5f11982b Mon Sep 17 00:00:00 2001
From: Brian Moe <brian.moe@ligo.org>
Date: Thu, 9 Jul 2009 18:22:59 -0500
Subject: [PATCH] Tidied email template
---
gracedb/alert.py | 22 +++++++++++++++++-----
settings.py | 2 +-
settings_dev.py | 2 +-
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/gracedb/alert.py b/gracedb/alert.py
index a26e245bf..2d94214f0 100644
--- a/gracedb/alert.py
+++ b/gracedb/alert.py
@@ -5,6 +5,9 @@ from subprocess import Popen, PIPE, STDOUT
from django.core.mail import send_mail
from django.conf import settings
+from django.contrib.sites.models import Site
+from django.core.urlresolvers import reverse, get_script_prefix
+
def issueAlert(event, location):
issueXMPPAlert(event, location)
@@ -15,12 +18,21 @@ def issueEmailAlert(event, location):
message = """
New Event
%s / %s
- GRACEID: %s
- Location: %s
- %s
- TWiki: %s
+ GRACEID: %s
+ Info: %s
+ Data: %s
+ TWiki: %s
+ Submitter: %s
+ Original Data: %s
"""
- message %= (event.group.name, event.get_analysisType_display(), event.graceid(), event.weburl(), location, event.wikiurl())
+ message %= (event.group.name,
+ event.get_analysisType_display(),
+ event.graceid(),
+ 'https://'+Site.objects.get_current().domain+ reverse("view", args=[event.graceid()]),
+ event.weburl(),
+ event.wikiurl(),
+ event.submitter.name,
+ location)
fromaddress = settings.ALERT_EMAIL_FROM
to = settings.ALERT_EMAIL_TO
send_mail(subject, message, fromaddress, to)
diff --git a/settings.py b/settings.py
index db11b5dfb..bc849d362 100644
--- a/settings.py
+++ b/settings.py
@@ -95,6 +95,6 @@ INSTALLED_APPS = (
'django.contrib.admin',
'django.contrib.contenttypes',
'django.contrib.sessions',
- #'django.contrib.sites',
+ 'django.contrib.sites',
'gracedb.gracedb',
)
diff --git a/settings_dev.py b/settings_dev.py
index 2bc059dee..53176ced3 100644
--- a/settings_dev.py
+++ b/settings_dev.py
@@ -93,6 +93,6 @@ INSTALLED_APPS = (
'django.contrib.admin',
'django.contrib.contenttypes',
'django.contrib.sessions',
- #'django.contrib.sites',
+ 'django.contrib.sites',
'gracedb.gracedb',
)
--
GitLab