Commit 53b74b25 authored by Gladys Forte's avatar Gladys Forte

serializers template

parent ac939fac
...@@ -20,7 +20,7 @@ class ChangeRequestTemplateApproversSerializer( ...@@ -20,7 +20,7 @@ class ChangeRequestTemplateApproversSerializer(
ret['company'] = model_to_dict(instance.user.department.company) ret['company'] = model_to_dict(instance.user.department.company)
ret['department'] = model_to_dict(instance.user.department) ret['department'] = model_to_dict(instance.user.department)
ret['user'] = user_object ret['user'] = user_object
return ret return ret
except Exception as e: except Exception as e:
ret['company'] = "none" ret['company'] = "none"
......
...@@ -7,7 +7,6 @@ from app.applicationlayer.cms.utils_cr import (get_account_details, ...@@ -7,7 +7,6 @@ from app.applicationlayer.cms.utils_cr import (get_account_details,
get_dept_details, get_dept_details,
get_companies_details) get_companies_details)
from app.applicationlayer.cms.template.approver.serializers import ChangeRequestTemplateApproversSerializer from app.applicationlayer.cms.template.approver.serializers import ChangeRequestTemplateApproversSerializer
from app.applicationlayer.cms.template.stakeholder.serializers import ChangeRequestTemplateStakeHoldersSerializer from app.applicationlayer.cms.template.stakeholder.serializers import ChangeRequestTemplateStakeHoldersSerializer
...@@ -45,15 +44,14 @@ class ChangeRequestTemplatesSerializer( ...@@ -45,15 +44,14 @@ class ChangeRequestTemplatesSerializer(
def to_representation(self, instance): def to_representation(self, instance):
ret = super().to_representation(instance) ret = super().to_representation(instance)
try: try:
ret['company'] = model_to_dict(instance.user.department.company) ret['company'] = instance.requested_to_company.name
ret['department'] = model_to_dict(instance.user.department) ret['department'] = instance.requested_to_department.name
ret['point_of_contact'] = model_to_dict(instance.requested_to_user) ret['point_of_contact'] = instance.requested_to_user.name
ret['created_by'] = instance.created_by_user.code ret['created_by'] = instance.created_by_user.name
return ret return ret
except Exception as e: except Exception as e:
ret['company'] = "none" ret['company'] = "none"
ret['department'] = "none" ret['department'] = "none"
ret['point_of_contact'] = "none" ret['point_of_contact'] = "none"
......
...@@ -219,7 +219,7 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet): ...@@ -219,7 +219,7 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
@transaction.atomic @transaction.atomic
def partial_update(self, request, *args, **kwargs): def partial_update(self, request, *args, **kwargs):
partial = kwargs.pop('partial', False) partial = kwargs.pop('partial', True)
instance = self.get_object() instance = self.get_object()
template_no = kwargs['template_no'] template_no = kwargs['template_no']
...@@ -256,39 +256,36 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet): ...@@ -256,39 +256,36 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
self, self,
template_no template_no
) )
tmp_add_edit_delete(
body_data['tmp_stakes'],
models.ChangeRequestTemplateStakeHolders,
enums.LogEntitiesEnum.ChangeRequestTemplateStakeHolders.value,
serializers.ChangeRequestTemplateStakeHoldersSerializer,
partial,
self,
template_no
)
if body_data['tmp_stakes']: tmp_add_edit_delete(
tmp_add_edit_delete( body_data['tmp_attachments'],
body_data['tmp_stakes'], models.ChangeRequestTemplateAttachments,
models.ChangeRequestTemplateStakeHolders, enums.LogEntitiesEnum.ChangeRequestTemplateAttachments.value,
enums.LogEntitiesEnum.ChangeRequestTemplateStakeHolders.value, serializers.ChangeRequestTemplateAttachmentsSerializer,
serializers.ChangeRequestTemplateStakeHoldersSerializer, partial,
partial, self,
self, template_no
template_no )
)
if body_data['tmp_attachments']:
tmp_add_edit_delete(
body_data['tmp_attachments'],
models.ChangeRequestTemplateAttachments,
enums.LogEntitiesEnum.ChangeRequestTemplateAttachments.value,
serializers.ChangeRequestTemplateAttachmentsSerializer,
partial,
self,
template_no
)
if body_data['tmp_details']: tmp_add_edit_delete(
tmp_add_edit_delete( body_data['tmp_details'],
body_data['tmp_details'], models.ChangeRequestTemplateDetails,
models.ChangeRequestTemplateDetails, enums.LogEntitiesEnum.ChangeRequestTemplateDetails.value,
enums.LogEntitiesEnum.ChangeRequestTemplateDetails.value, serializers.ChangeRequestTemplateDetailsSerializer,
serializers.ChangeRequestTemplateDetailsSerializer, partial,
partial, self,
self, template_no
template_no )
)
serializer = self.get_serializer(instance) serializer = self.get_serializer(instance)
...@@ -304,7 +301,7 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet): ...@@ -304,7 +301,7 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
"Unable to edit due to existing transaction", "Unable to edit due to existing transaction",
status=status.HTTP_400_BAD_REQUEST status=status.HTTP_400_BAD_REQUEST
) )
#try
class ChangeRequestTemplatePost(APIView): class ChangeRequestTemplatePost(APIView):
......
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