Merge pull request #1214 from AlanCoding/fix_schedule_qs

Change schedule queryset logic to avoid server error
This commit is contained in:
Alan Rominger 2018-02-13 12:54:05 -05:00 committed by GitHub
commit 6cb3267ebe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2159,13 +2159,9 @@ class ScheduleAccess(BaseAccess):
prefetch_related = ('unified_job_template', 'credentials',)
def filtered_queryset(self):
qs = self.model.objects.all()
unified_pk_qs = UnifiedJobTemplate.accessible_pk_qs(self.user, 'read_role')
inv_src_qs = InventorySource.objects.filter(inventory_id=Inventory._accessible_pk_qs(Inventory, self.user, 'read_role'))
return qs.filter(
Q(unified_job_template_id__in=unified_pk_qs) |
Q(unified_job_template_id__in=inv_src_qs.values_list('pk', flat=True)))
return self.model.objects.filter(
unified_job_template__in=UnifiedJobTemplateAccess(self.user).filtered_queryset()
)
@check_superuser
def can_add(self, data):