Merge pull request #256 in RMS/api-main-service from RMSv2 to staging

* commit 'cffd69d9':
  fixing
  rejected remarks

app/applicationlayer/cms/form/header/views.py

@@ -54,6 +54,7 @@ from app.applicationlayer.cms.form.header.table_filters import HeaderFilterSet
 from rest_framework.filters import SearchFilter, OrderingFilter
 from django_filters import rest_framework as filters
 from django_filters.rest_framework import DjangoFilterBackend
+import json
 
 APPROVER_MESSAGE = settings.APPROVER_MESSAGE
 REQUESTOR_MESSAGE = settings.REQUESTOR_MESSAGE
@@ -450,7 +451,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
                 return Response(
                     {"message": "Cannot archive this change request due to ongoing transaction"},
                         status=status.HTTP_400_BAD_REQUEST)
-                    
+
         except Exception as e:
             return Response(e,
                             status=status.HTTP_500_INTERNAL_SERVER_ERROR)
@@ -561,7 +562,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
         # partial update
         partial = kwargs.pop('partial', True)
         instance = self.get_object()
-
+        
         form_code = kwargs['form_code']
 
         # get prefix from template header

app/helper/email_service/sender.py

@@ -494,7 +494,7 @@ def routing_table_actions(args):
     department_requestedto = args[7]
     priority_level = args[8]
     url = args[9]
-    remarks = args[10]
+    remarks = str(args[10])
     
     recipient = args[11]
     action_type = args[12]

config/settings/staging.py

@@ -20,23 +20,23 @@ CHANNEL_LAYERS = {
 
 DATABASES = {
     'default': {
-        'ENGINE': config['staging']['DATABASE_ENGINE'],
-        'NAME': config['staging']['DATABASE_NAME'],
-        'USER': config['staging']['DATABASE_USER'],
-        'PASSWORD': config['staging']['DATABASE_PASSWORD'],
-        'HOST': config['staging']['DATABASE_HOST'],
-        'PORT': config['staging']['DATABASE_PORT'],
+        'ENGINE': config['STAGING']['DATABASE_ENGINE'],
+        'NAME': config['STAGING']['DATABASE_NAME'],
+        'USER': config['STAGING']['DATABASE_USER'],
+        'PASSWORD': config['STAGING']['DATABASE_PASSWORD'],
+        'HOST': config['STAGING']['DATABASE_HOST'],
+        'PORT': config['STAGING']['DATABASE_PORT'],
     }
 }
 
 # ****************
 # PROGRAM SETTINGS
 # ****************
-SESSION_TIMEOUT = config['staging']['SESSION_TIMEOUT']
-FRONT_END_URL = config['staging']['FRONT_END_URL']
-AUTH_ACCESSS_TOKEN_TIMEOUT = config['staging']['AUTH_ACCESSS_TOKEN_TIMEOUT']
-USER_DEFAULT_PASSWORD = config['staging']['USER_DEFAULT_PASSWORD']
-REALTIMESERVER_IP = config['staging']['REALTIMESERVER_IP']
+SESSION_TIMEOUT = config['STAGING']['SESSION_TIMEOUT']
+FRONT_END_URL = config['STAGING']['FRONT_END_URL']
+AUTH_ACCESSS_TOKEN_TIMEOUT = config['STAGING']['AUTH_ACCESSS_TOKEN_TIMEOUT']
+USER_DEFAULT_PASSWORD = config['STAGING']['USER_DEFAULT_PASSWORD']
+REALTIMESERVER_IP = config['STAGING']['REALTIMESERVER_IP']
 
 # Notification Messages
 APPROVER_MESSAGE = config['NOTIFICATION_EMAIL']['APPROVER_MESSAGE']
@@ -49,6 +49,6 @@ VENDOR_ACCEPTANCE_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_ACCEPTANCE_MESS
 VENDOR_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_REJECT_MESSAGE']
 
 #ADMIN PROFILE
-CATCH_EMAIL = config['staging']['CATCH_EMAIL']
+CATCH_EMAIL = config['STAGING']['CATCH_EMAIL']
 
-CR_FRONT_LINK = config['staging']['CR_LINK']
+CR_FRONT_LINK = config['STAGING']['CR_LINK']