Merge pull request #283 in RMS/api-main-service from red-develop to RMSv2

* commit '8ca96fe7':
  fixing

app/applicationlayer/cms/template/header/views.py

@@ -186,7 +186,8 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
         partial = kwargs.pop('partial', False)
         instance = self.get_object()
 
-        template_no = kwargs['template_no']
+        # template_no = kwargs['template_no']
+        template_no = instance.template_no
 
         body_data = request.data
 

app/applicationlayer/management/user/serializers.py

@@ -89,6 +89,7 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
         else:
             permission = True
         return permission
+
     def get_create_template(self, user):
         check_user = models.AllowedCompany.objects.filter(
             Q(id_number=user.code) &
@@ -111,17 +112,14 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
             return request.build_absolute_uri('/media/no-user.png')
 
     def get_applications(self, user):
-        # app = user.application.exclude(id=1)
         if user.user_type.upper() == enums.UserTypeEnum.USER.value:
             app = user.application.exclude(id=1)
         else:
             app = user.application.all()
         list_app = []
-        initial_mod = {}
-        rms = models.Application.objects.filter(id=1).values().first()
 
         for data in app:
-            mod = data.modules.filter(~Q(name__icontains='header'))
+            mod = data.modules.all()
             if user.user_type.upper() != enums.UserTypeEnum.USER.value:
                 if user.user_type.upper() != enums.UserTypeEnum.USER.value:
                     user_module = models.Module.objects.filter(