Handle notifications to shared users better.

cedadev · May 12, 2023 · 6ff553b · 6ff553b
1 parent d7ed200
commit 6ff553b
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/jasmin_services/templates/jasmin_notifications/mail/grant_created/content.txt b/jasmin_services/templates/jasmin_notifications/mail/grant_created/content.txt
@@ -2,7 +2,7 @@
 
 {% block content %}
 Hi {{ user.first_name }},
-{% if target.access.user.user_type == "SERVICE" %}
+{% if (target.access.user.user_type == "SERVICE" or (target.access.user.user_type == "SHARED") %}
 The following access has been granted:
 
     Service: {{ target.access.role.service }}

diff --git a/jasmin_services/templates/jasmin_notifications/mail/grant_expired/content.txt b/jasmin_services/templates/jasmin_notifications/mail/grant_expired/content.txt
@@ -4,7 +4,7 @@
 Hi {{ user.first_name }},
 
 The following access has expired:
-{% if target.access.user.user_type == "SERVICE" %}
+{% if (target.access.user.user_type == "SERVICE" or (target.access.user.user_type == "SHARED") %}
     Service: {{ target.access.role.service }}
     Role: {{ target.access.role.name }}
     User: {{ target.access.user }}

diff --git a/jasmin_services/templates/jasmin_notifications/mail/grant_expiring/content.txt b/jasmin_services/templates/jasmin_notifications/mail/grant_expiring/content.txt
@@ -4,7 +4,7 @@
 Hi {{ user.first_name }},
 
 The following access will expire soon:
-{% if target.access.user.user_type == "SERVICE" %}
+{% if (target.access.user.user_type == "SERVICE" or (target.access.user.user_type == "SHARED") %}
     Service: {{ target.access.role.service }}
     Role: {{ target.access.role.name }}
     User: {{ target.access.user }}

diff --git a/jasmin_services/templates/jasmin_notifications/mail/grant_revoked/content.txt b/jasmin_services/templates/jasmin_notifications/mail/grant_revoked/content.txt
@@ -4,7 +4,7 @@
 Hi {{ user.first_name }},
 
 The following access has been revoked:
-{% if target.access.user.user_type == "SERVICE" %}
+{% if (target.access.user.user_type == "SERVICE" or (target.access.user.user_type == "SHARED") %}
     Service: {{ target.access.role.service }}
     Role: {{ target.access.role.name }}
     User: {{ target.access.user }}

diff --git a/jasmin_services/templates/jasmin_notifications/mail/request_confirm/content.txt b/jasmin_services/templates/jasmin_notifications/mail/request_confirm/content.txt
@@ -4,7 +4,7 @@
 Hi {{ user.first_name }},
 
 The following request has been submitted for approval:
-{% if target.access.user.user_type == "SERVICE" %}
+{% if (target.access.user.user_type == "SERVICE" or (target.access.user.user_type == "SHARED") %}
     Service: {{ target.access.role.service }}
     Role: {{ target.access.role.name }}
     User: {{ target.access.user }}

diff --git a/jasmin_services/templates/jasmin_notifications/mail/request_incomplete/content.txt b/jasmin_services/templates/jasmin_notifications/mail/request_incomplete/content.txt
@@ -4,7 +4,7 @@
 Hi {{ user.first_name }},
 
 The following request requires additional information:
-{% if target.access.user.user_type == "SERVICE" %}
+{% if (target.access.user.user_type == "SERVICE" or (target.access.user.user_type == "SHARED") %}
     Service: {{ target.access.role.service }}
     Role: {{ target.access.role.name }}
     User: {{ target.access.user }}

diff --git a/jasmin_services/templates/jasmin_notifications/mail/request_rejected/content.txt b/jasmin_services/templates/jasmin_notifications/mail/request_rejected/content.txt
@@ -4,7 +4,7 @@
 Hi {{ user.first_name }},
 
 The following request has been rejected:
-{% if target.access.user.user_type == "SERVICE" %}
+{% if (target.access.user.user_type == "SERVICE" or (target.access.user.user_type == "SHARED") %}
     Service: {{ target.access.role.service }}
     Role: {{ target.access.role.name }}
     User: {{ target.access.user }}