Merge pull request #675 in RMS/api-main-service from red-develop to product-dev

* commit '97361ea0':
  fixing

app/applicationlayer/cms/cms_settings/views.py

@@ -86,9 +86,8 @@ class CMSSettingsViewSet(viewsets.ModelViewSet):
 
         active_user = self.request.user.name
         admin = request.user.email
-        linking = 'as'
 
-        args = [behalf_name, 'Removed', active_user, behalf_email, admin, linking]
+        args = [behalf_name, 'Removed', active_user, behalf_email, admin, 'as']
         main_threading(args, sender.on_behalf)
 
         return Response(status=status.HTTP_204_NO_CONTENT)
@@ -117,14 +116,13 @@ class CMSSettingsViewSet(viewsets.ModelViewSet):
             active_user = self.request.user.name
             action = 'Added'
             admin = request.user.email
-            linking = 'on'
 
             for data in data_cms_settings:
                 recipient = User.objects.get(
                     code=str(data['behalf_user'])
                 )
 
-                args = [recipient.name, action, active_user, recipient.email, admin, linking]
+                args = [recipient.name, action, active_user, recipient.email, admin, 'on']
                 main_threading(args, sender.on_behalf)
             
             if serializer.is_valid(raise_exception=True):

app/helper/email_service/sender.py

@@ -607,7 +607,6 @@ def on_behalf(args):
     recipient = args[3]
     admin = args[4]
     linking = args[5]
-    print(args)
     
     F = open(os.path.join(settings.EMAIL_TEMPLATES_ROOT, 'RMS-ONBEHALF.html'), 'r')