Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into red-develop

app/applicationlayer/cms/form/views.py

@@ -273,7 +273,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
         url_path='re_route', url_name='re_route'
     )
     def re_route(self, request, *args, **kwargs):
-
+        
         form_code = kwargs['form_code']
         
         models.ChangeRequestFormHeader.objects.filter(

config/settings/dev.py

@@ -42,4 +42,4 @@ VENDOR_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_REJECT_MESSAGE']
 #ADMIN PROFILE
 CATCH_EMAIL = config['DEV']['CATCH_EMAIL']
 
-CR_FRONT_LINK = config['CR_FRONT_LINK']['CR_LINK']
+CR_FRONT_LINK = config['DEV']['CR_LINK']

config/settings/local.py

@@ -40,4 +40,4 @@ VENDOR_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_REJECT_MESSAGE']
 #ADMIN PROFILE
 CATCH_EMAIL = config['LOCAL']['CATCH_EMAIL']
 
-CR_FRONT_LINK = config['CR_FRONT_LINK']['CR_LINK']
+CR_FRONT_LINK = config['LOCAL']['CR_LINK']

config/settings/production.py

@@ -42,4 +42,4 @@ VENDOR_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_REJECT_MESSAGE']
 #ADMIN PROFILE
 CATCH_EMAIL = config['PRODUCTION']['CATCH_EMAIL']
 
-CR_FRONT_LINK = config['CR_FRONT_LINK']['CR_LINK']
+CR_FRONT_LINK = config['PRODUCTION']['CR_LINK']

config/settings/uat.py

@@ -43,4 +43,4 @@ VENDOR_REJECT_MESSAGE = config['NOTIFICATION_EMAIL']['VENDOR_REJECT_MESSAGE']
 #ADMIN PROFILE
 CATCH_EMAIL = config['UAT']['CATCH_EMAIL']
 
-CR_FRONT_LINK = config['CR_FRONT_LINK']['CR_LINK']
+CR_FRONT_LINK = config['UAT']['CR_LINK']

env.template.ini

@@ -10,6 +10,7 @@ FRONT_END_URL =
 AUTH_ACCESSS_TOKEN_TIMEOUT = 
 USER_DEFAULT_PASSWORD = 
 CATCH_EMAIL = gladys@tirsolutions.com
+CR_LINK = http://staging.rms.oneberrysystem.com/cms/change-request/form/view
 
 [UAT]
 DATABASE_ENGINE = django.db.backends.mysql
@@ -23,6 +24,7 @@ FRONT_END_URL =
 AUTH_ACCESSS_TOKEN_TIMEOUT = 
 USER_DEFAULT_PASSWORD = 
 CATCH_EMAIL = gladys@tirsolutions.com
+CR_LINK = http://staging.rms.oneberrysystem.com/cms/change-request/form/view
 
 [DEV]
 DATABASE_ENGINE = django.db.backends.mysql
@@ -36,12 +38,13 @@ FRONT_END_URL =
 AUTH_ACCESSS_TOKEN_TIMEOUT = 
 USER_DEFAULT_PASSWORD = 
 CATCH_EMAIL = gladys@tirsolutions.com
+CR_LINK = http://devweb.rms.oneberrysystem.com/cms/change-request/form/view
 
 [LOCAL]
 DATABASE_ENGINE = django.db.backends.mysql
 DATABASE_NAME = rms_db
 DATABASE_USER = root
-DATABASE_PASSWORD = password
+DATABASE_PASSWORD = 123
 DATABASE_HOST = localhost
 DATABASE_PORT = 3306
 SESSION_TIMEOUT = 30
@@ -49,6 +52,7 @@ FRONT_END_URL =
 AUTH_ACCESSS_TOKEN_TIMEOUT = 3600
 USER_DEFAULT_PASSWORD = password
 CATCH_EMAIL = gladys@tirsolutions.com
+CR_LINK = http://localhost:8000/cms/change-request/form/view
 
 [NOTIFICATION]
 REALTIMESERVER_IP = 127.0.0.1:8000
@@ -56,9 +60,6 @@ REALTIMESERVER_IP = 127.0.0.1:8000
 [SETTINGS]
 CONFIG = config.settings.local
 
-[CR_FRONT_LINK]
-CR_LINK = http://staging.rms.oneberrysystem.com/cms/change-request/form/view
-
 [NOTIFICATION_EMAIL]
 APPROVER_MESSAGE = has sent you an APPROVAL REQUEST for change request;RMS-ACTIONREQUIRED
 REQUESTOR_MESSAGE = has APPROVED the change request;RMS-CRAPPROVED