Commit fc39a41a authored by John Red Medrano's avatar John Red Medrano

fixing issue on verb

parent 602612ca
...@@ -86,8 +86,9 @@ class CMSSettingsViewSet(viewsets.ModelViewSet): ...@@ -86,8 +86,9 @@ class CMSSettingsViewSet(viewsets.ModelViewSet):
active_user = self.request.user.name active_user = self.request.user.name
admin = request.user.email admin = request.user.email
linking_verb = 'as'
args = [behalf_name, 'Removed', active_user, behalf_email, admin, 'as'] args = [behalf_name, 'Removed', active_user, behalf_email, admin, linking_verb]
main_threading(args, sender.on_behalf) main_threading(args, sender.on_behalf)
return Response(status=status.HTTP_204_NO_CONTENT) return Response(status=status.HTTP_204_NO_CONTENT)
...@@ -116,13 +117,14 @@ class CMSSettingsViewSet(viewsets.ModelViewSet): ...@@ -116,13 +117,14 @@ class CMSSettingsViewSet(viewsets.ModelViewSet):
active_user = self.request.user.name active_user = self.request.user.name
action = 'Added' action = 'Added'
admin = request.user.email admin = request.user.email
linking_verb = 'on'
for data in data_cms_settings: for data in data_cms_settings:
recipient = User.objects.get( recipient = User.objects.get(
code=str(data['behalf_user']) code=str(data['behalf_user'])
) )
args = [recipient.name, action, active_user, recipient.email, admin, 'on'] args = [recipient.name, action, active_user, recipient.email, admin, linking_verb]
main_threading(args, sender.on_behalf) main_threading(args, sender.on_behalf)
if serializer.is_valid(raise_exception=True): if serializer.is_valid(raise_exception=True):
......
...@@ -606,8 +606,7 @@ def on_behalf(args): ...@@ -606,8 +606,7 @@ def on_behalf(args):
recipient = args[3] recipient = args[3]
admin = args[4] admin = args[4]
verb = args[5] linking_verb = args[5]
print(verb)
F = open(os.path.join(settings.EMAIL_TEMPLATES_ROOT, 'RMS-ONBEHALF.html'), 'r') F = open(os.path.join(settings.EMAIL_TEMPLATES_ROOT, 'RMS-ONBEHALF.html'), 'r')
...@@ -616,6 +615,7 @@ def on_behalf(args): ...@@ -616,6 +615,7 @@ def on_behalf(args):
FC = FC.replace('{name}', name) FC = FC.replace('{name}', name)
FC = FC.replace('{action}', action) FC = FC.replace('{action}', action)
FC = FC.replace('{active_user}', active_user) FC = FC.replace('{active_user}', active_user)
FC = FC.replace('{linking_verb}', linking_verb)
try: try:
send_mail( send_mail(
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<h3 style="color:#888888;">{action} on Behalf</h3><br> <h3 style="color:#888888;">{action} on Behalf</h3><br>
<p>Dear {name},</p><br> <p>Dear {name},</p><br>
<p>Please be informed that {active_user} {action} you {verb} their behalf for change requests under Actions on Behalf. </p><br> <p>Please be informed that {active_user} {action} you {linking_verb} their behalf for change requests under Actions on Behalf. </p><br>
<!-- <p>Please be informed that {active_user} {action} you as on behalf user for change request. </p><br> --> <!-- <p>Please be informed that {active_user} {action} you as on behalf user for change request. </p><br> -->
<p>Sincerely,</p> <p>Sincerely,</p>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment