Commit 59a98920 authored by Gladys Forte's avatar Gladys Forte

{dev bugfix} fix server error 500 on form post due to remove key company_desc,...

{dev bugfix} fix server error 500 on form post due to remove key company_desc, deprtment_desc, requested_desc
parent 7ca91e3e
......@@ -1194,6 +1194,7 @@ class ChangeRequestFormPost(APIView):
@FormValidation
@transaction.atomic()
def post(self, request):
form_header = request.data
try:
data_list_approver = []
......@@ -1209,9 +1210,9 @@ class ChangeRequestFormPost(APIView):
'requested_to_priority': form_header['requested_to_priority'],
'description': form_header['description'],
'status': form_header['status'],
'company_desc': form_header['company_desc'],
'department_desc': form_header['department_desc'],
'requested_desc': form_header['requested_desc'],
'company_desc': None,
'department_desc': None,
'requested_desc': None,
'requested_by_department': form_header['requested_by_department'],
'requested_by_user': form_header['requested_by_user'],
'requested_to_company': form_header['requested_to_company'],
......
......@@ -138,6 +138,7 @@ def validation_approver_same_level(approvers):
for approver in approvers:
if 'user' in approver and 'level' in approver:
if not approver['user'] is None:
data_list_appr.append(approver)
# add checking
......
......@@ -394,6 +394,7 @@ def FormValidation(function):
# Do not allow adding an approver for the same level
validation_result = validation_approver_same_level(frm_approvers)
if validation_result is not None:
return error_message('400', validation_result + ' is already exist for the same level of approval.',
'failed', status.HTTP_400_BAD_REQUEST)
......
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