Update notification email templates to include the 'variant' field

galaxyproject · Apr 17, 2024 · 785a90a · 785a90a
1 parent c8e3636
commit 785a90a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/lib/galaxy/config/templates/mail/notifications/message-email.html b/lib/galaxy/config/templates/mail/notifications/message-email.html
@@ -16,9 +16,10 @@
 - hostname                  Your galaxy's hostname (i.e. usegalaxy.* or the value in `server_name` from the galaxy config file)
 - contact_email             Your galaxy's contact email
 - notification_settings_url The URL to the user's notification settings to manage their subscriptions
+- variant                   The notification variant indicates the level of importance of the notification (i.e. info, warning, urgent)
 - content                   The message payload
-  - subject                   The message subject
-  - content                   The message content in HTML (converted from Markdown)
+  - subject                 The message subject
+  - content                 The message content in HTML (converted from Markdown)
 - galaxy_url                The URL to the Galaxy instance (i.e. https://usegalaxy.*)
 
 Template begins here >>>>>>

diff --git a/lib/galaxy/config/templates/mail/notifications/message-email.txt b/lib/galaxy/config/templates/mail/notifications/message-email.txt
@@ -16,6 +16,7 @@ sent:
 - hostname                  Your galaxy's hostname (i.e. usegalaxy.* or the value in `server_name` from the galaxy config file)
 - contact_email             Your galaxy's contact email
 - notification_settings_url The URL to the user's notification settings to manage their subscriptions
+- variant                   The notification variant indicates the level of importance of the notification (i.e. info, warning, urgent)
 - content                   The message payload
   - subject                 The message subject
   - content                 The message content in HTML (converted from Markdown)

diff --git a/lib/galaxy/config/templates/mail/notifications/new_shared_item-email.html b/lib/galaxy/config/templates/mail/notifications/new_shared_item-email.html
@@ -16,6 +16,7 @@
 - hostname                  Your galaxy's hostname (i.e. usegalaxy.* or the value in `server_name` from the galaxy config file)
 - contact_email             Your galaxy's contact email
 - notification_settings_url The URL to the user's notification settings to manage their subscriptions
+- variant                   The notification variant indicates the level of importance of the notification (i.e. info, warning, urgent)
 - content                   The new_shared_item payload
   - item_type               The type of the shared item
   - item_name               The name of the shared item

diff --git a/lib/galaxy/config/templates/mail/notifications/new_shared_item-email.txt b/lib/galaxy/config/templates/mail/notifications/new_shared_item-email.txt
@@ -16,6 +16,7 @@ sent:
 - hostname                  Your galaxy's hostname (i.e. usegalaxy.* or the value in `server_name` from the galaxy config file)
 - contact_email             Your galaxy's contact email
 - notification_settings_url The URL to the user's notification settings to manage their subscriptions
+- variant                   The notification variant indicates the level of importance of the notification (i.e. info, warning, urgent)
 - content                   The new_shared_item payload
   - item_type               The type of the shared item
   - item_name               The name of the shared item

diff --git a/lib/galaxy/managers/notification.py b/lib/galaxy/managers/notification.py
@@ -664,6 +664,7 @@ class NotificationContext(BaseModel):
     date: str
     hostname: str
     contact_email: str
+    variant: str
     notification_settings_url: str
     content: AnyNotificationContent
     galaxy_url: Optional[str] = None
@@ -713,6 +714,7 @@ def build_context(self, template_format: TemplateFormats) -> NotificationContext
             hostname=hostname,
             contact_email=contact_email,
             notification_settings_url=notification_settings_url,
+            variant=notification.variant,
             content=self.get_content(template_format),
             galaxy_url=self.notification.galaxy_url,
         )