Commit 25e2e2f2 authored by John Red Medrano's avatar John Red Medrano

fixing

parent 41e58bcf
...@@ -86,9 +86,9 @@ class CMSSettingsViewSet(viewsets.ModelViewSet): ...@@ -86,9 +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' linking = 'as'
args = [behalf_name, 'Removed', active_user, behalf_email, admin, linking_verb] args = [behalf_name, 'Removed', active_user, behalf_email, admin, linking]
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)
...@@ -117,14 +117,14 @@ class CMSSettingsViewSet(viewsets.ModelViewSet): ...@@ -117,14 +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' linking = '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, linking_verb] args = [recipient.name, action, active_user, recipient.email, admin, linking]
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,7 +606,7 @@ def on_behalf(args): ...@@ -606,7 +606,7 @@ def on_behalf(args):
recipient = args[3] recipient = args[3]
admin = args[4] admin = args[4]
linking_verb = args[5] linking = args[5]
print(args) print(args)
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')
......
...@@ -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 {linking_verb} their behalf for change requests under Actions on Behalf. </p><br> <p>Please be informed that {active_user} {action} you {linking} 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