Commit c73650bc authored by John Red Medrano's avatar John Red Medrano

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

* commit '9662ca9c':
  fixing the company selection on cr
parents d57996e9 9662ca9c
...@@ -29,7 +29,7 @@ class ChangeRequestCompanyFormViewSet(viewsets.ModelViewSet): ...@@ -29,7 +29,7 @@ class ChangeRequestCompanyFormViewSet(viewsets.ModelViewSet):
queryset = self.filter_queryset(self.get_queryset()) queryset = self.filter_queryset(self.get_queryset())
allowed = AllowedCompany.objects.filter( allowed = AllowedCompany.objects.filter(
Q(id_number=self.request.user.code) & Q(id_number=self.request.user.code) &
Q(create_change_request_template=True) Q(create_change_request=True)
).values('company_pivot') ).values('company_pivot')
queryset = queryset.filter(code__in=allowed) queryset = queryset.filter(code__in=allowed)
page = self.paginate_queryset(queryset) page = self.paginate_queryset(queryset)
......
...@@ -35,7 +35,7 @@ class ChangeRequestDepartmentFormViewSet(viewsets.ModelViewSet): ...@@ -35,7 +35,7 @@ class ChangeRequestDepartmentFormViewSet(viewsets.ModelViewSet):
allowed = AllowedCompany.objects.filter( allowed = AllowedCompany.objects.filter(
Q(id_number=self.request.user.code) & Q(id_number=self.request.user.code) &
Q(company_pivot=company) & Q(company_pivot=company) &
Q(create_change_request_template=True) Q(create_change_request=True)
).values('group_pivots') ).values('group_pivots')
queryset = queryset.filter(code__in=allowed) queryset = queryset.filter(code__in=allowed)
page = self.paginate_queryset(queryset) page = self.paginate_queryset(queryset)
......
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