diff --git a/product/ERP5/Document/Alarm.py b/product/ERP5/Document/Alarm.py index 89353cec33eb216e4ff2f403708154c878e8b130..4d1589aa8d91a5388461d864c70ea140c276b240 100644 --- a/product/ERP5/Document/Alarm.py +++ b/product/ERP5/Document/Alarm.py @@ -483,17 +483,18 @@ class Alarm(XMLObject, PeriodicityMixin): 'mime_type': 'text/plain'}) notification_tool.sendMessage(recipient=candidate_list, - subject='[%s] ERP5 Alarm Notification: %s' % - (prefix, self.getTitle()), + subject='[%s][%s] Alarm Notification: %s' % + (prefix, self.getPortalObject().getTitle(), self.getTitle()), message=""" -Alarm Title: %s +Alarm Title: %s (%s) Alarm Description: %s -Alarm URL: %s -""" % (self.getTitle(), self.getDescription(), self.absolute_url()), - attachment_list=attachment_list) +Alarm Tool Node: %s +""" % (self.getTitle(), self.getId(), self.getDescription(), + self.getPortalObject().portal_alarms.getAlarmNode()), + attachment_list=attachment_list) security.declareProtected(Permissions.ManagePortal, 'getLastActiveProcess') def getLastActiveProcess(self, include_active=False):