cms template restructure

app/applicationlayer/cms/template/views.py

@@ -29,7 +29,7 @@ from app.businesslayer.changerequest.change_request_template import (
 )
 from app.applicationlayer.management.account.serializer import ChangeRequestList
 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
 from app.applicationlayer.cms.template.details.serializers import ChangeRequestTemplateDetailsSerializer
 from app.applicationlayer.cms.template.attachment.serializers import ChangeRequestTemplateAttachmentsSerializer
 
@@ -207,13 +207,8 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
 
     @transaction.atomic
     def partial_update(self, request, *args, **kwargs):
-<<<<<<< HEAD
-
-        partial = kwargs.pop('partial', False)
-=======
         
         partial = kwargs.pop('partial', True)
->>>>>>> 499b31aed51c5eb9414a0a713597b2951aa6a974
         instance = self.get_object()
 
         template_no = kwargs['template_no']
@@ -255,46 +250,12 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
                 body_data['tmp_stakes'],
                 models.ChangeRequestTemplateStakeHolders,
                 enums.LogEntitiesEnum.ChangeRequestTemplateStakeHolders.value,
-                serializers.ChangeRequestTemplateStakeHoldersSerializer,
+                ChangeRequestTemplateStakeHoldersSerializer,
                 partial,
                 self,
                 template_no
             )
 
-<<<<<<< HEAD
-            if body_data['tmp_stakes']:
-                tmp_add_edit_delete(
-                    body_data['tmp_stakes'],
-                    models.ChangeRequestTemplateStakeHolders,
-                    enums.LogEntitiesEnum.ChangeRequestTemplateStakeHolders.value,
-                    ChangeRequestTemplateStakeHoldersSerializer,
-                    partial,
-                    self,
-                    template_no
-                )
-
-            if body_data['tmp_attachments']:
-                tmp_add_edit_delete(
-                    body_data['tmp_attachments'],
-                    models.ChangeRequestTemplateAttachments,
-                    enums.LogEntitiesEnum.ChangeRequestTemplateAttachments.value,
-                    ChangeRequestTemplateAttachmentsSerializer,
-                    partial,
-                    self,
-                    template_no
-                )
-
-            if body_data['tmp_details']:
-                tmp_add_edit_delete(
-                    body_data['tmp_details'],
-                    models.ChangeRequestTemplateDetails,
-                    enums.LogEntitiesEnum.ChangeRequestTemplateDetails.value,
-                    ChangeRequestTemplateDetailsSerializer,
-                    partial,
-                    self,
-                    template_no
-                )
-=======
             tmp_add_edit_delete(
                 body_data['tmp_attachments'],
                 models.ChangeRequestTemplateAttachments,
@@ -314,7 +275,6 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
                 self,
                 template_no
             )
->>>>>>> 499b31aed51c5eb9414a0a713597b2951aa6a974
 
             serializer = self.get_serializer(instance)