Commit 8ca96fe7 authored by John Red Medrano's avatar John Red Medrano

fixing

parent f198848c
...@@ -186,7 +186,8 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet): ...@@ -186,7 +186,8 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
partial = kwargs.pop('partial', False) partial = kwargs.pop('partial', False)
instance = self.get_object() instance = self.get_object()
template_no = kwargs['template_no'] # template_no = kwargs['template_no']
template_no = instance.template_no
body_data = request.data body_data = request.data
......
...@@ -89,6 +89,7 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer): ...@@ -89,6 +89,7 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
else: else:
permission = True permission = True
return permission return permission
def get_create_template(self, user): def get_create_template(self, user):
check_user = models.AllowedCompany.objects.filter( check_user = models.AllowedCompany.objects.filter(
Q(id_number=user.code) & Q(id_number=user.code) &
...@@ -111,17 +112,14 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer): ...@@ -111,17 +112,14 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
return request.build_absolute_uri('/media/no-user.png') return request.build_absolute_uri('/media/no-user.png')
def get_applications(self, user): def get_applications(self, user):
# app = user.application.exclude(id=1)
if user.user_type.upper() == enums.UserTypeEnum.USER.value: if user.user_type.upper() == enums.UserTypeEnum.USER.value:
app = user.application.exclude(id=1) app = user.application.exclude(id=1)
else: else:
app = user.application.all() app = user.application.all()
list_app = [] list_app = []
initial_mod = {}
rms = models.Application.objects.filter(id=1).values().first()
for data in app: 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:
if user.user_type.upper() != enums.UserTypeEnum.USER.value: if user.user_type.upper() != enums.UserTypeEnum.USER.value:
user_module = models.Module.objects.filter( user_module = models.Module.objects.filter(
......
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