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

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

@@ -93,7 +93,7 @@ class ChangeRequestFormHeaderSerializer(
             ret['requested_to_company'] = "None"
             ret['requested_to_department'] = "None"
             ret['requested_to_user'] = "None"
-            ret['requested_by_user'] ="None"
+            ret['requested_by_user'] = "None"
             ret['requested_by_department'] = "None"
             ret['template_object'] = "None"
 

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

@@ -5,13 +5,14 @@ from app.entities.models import ChangeRequestFormHeader
 class HeaderFilterSet(filters.FilterSet):
 
     # action_required = filters.CharFilter(method='action_required_bar')
+    
+    class Meta:
+        model = ChangeRequestFormHeader
+        fields = '__all__'
+
     # def action_required_bar(self, queryset, name, value):
     #     return queryset.filter(
     #         Q(title__icontains=value) |
     #         Q(name__icontains=value) |
     #         Q(description__icontains=value)
     #     )
-
-    class Meta:
-        model = ChangeRequestFormHeader
-        fields = '__all__'

app/applicationlayer/management/delegation/views.py

@@ -64,9 +64,6 @@ class DelegationViewSet(viewsets.ModelViewSet):
     @transaction.atomic
     def destroy(self, request, *args, **kwargs):
 
-        # instance = self.get_object()
-        # new_instance = model_to_dict(instance)
-
         message = {
             'code': 400,
             'status': 'failed',
@@ -74,52 +71,6 @@ class DelegationViewSet(viewsets.ModelViewSet):
         }
         return Response(message, status=status.HTTP_400_BAD_REQUEST)
 
-        # exist_in_dept = instance.departments.all()
-
-        # restrictions
-        # if not exist_in_dept.count() > 0:
-
-        #     print(exist_in_dept)
-
-        #     if not (new_instance['name'].lower() == 'head of department' or
-        #             new_instance['name'].lower() == 'sd/od' or
-        #             new_instance['name'].lower() == 'change control board' or
-        #             new_instance['name'].lower() == 'approver' or
-        #             new_instance['name'].lower() == 'vendor/implementor' or
-        #             new_instance['name'].lower() == 'requestor'):
-
-        #         self.perform_destroy(instance)
-                
-        #         log_save(
-        #             enums.LogEnum.DELETED.value,
-        #             enums.LogEntitiesEnum.DELEGATION.value,
-        #             new_instance['id'],
-        #             new_instance,
-        #             ''
-        #         )
-
-        #         message = {
-        #             'code': 200,
-        #             'status': 'success',
-        #             'message': 'Delegation Successfully deleted'
-        #         }
-        #         return Response(message, status=status.HTTP_200_OK)
-
-        #     else:
-        #         message = {
-        #             'code': 400,
-        #             'status': 'failed',
-        #             'message': 'Default delegation cannot delete'
-        #         }
-        #         return Response(message, status=status.HTTP_400_BAD_REQUEST)
-        # else:
-        #     message = {
-        #         'code': 400,
-        #         'status': 'failed',
-        #         'message': 'Cannot delete this delegation due to existing record in department'
-        #     }
-        #     return Response(message, status=status.HTTP_400_BAD_REQUEST)
-
     @transaction.atomic
     def update(self, request, *args, **kwargs):
 
@@ -133,12 +84,7 @@ class DelegationViewSet(viewsets.ModelViewSet):
 
         old_instance = model_to_dict(instance)
         
-        # restrictions
-        if not (old_instance['name'].lower() == 'head of department' or
-                old_instance['name'].lower() == 'sd/od' or
-                old_instance['name'].lower() == 'change control board' or
-                old_instance['name'].lower() == 'approver' or
-                old_instance['name'].lower() == 'vendor/implementor' or
+        if not (old_instance['name'].lower() == 'vendor/implementor' or
                 old_instance['name'].lower() == 'requestor'):
             
             self.perform_update(serializer)