Revert to using the explicit dispatch to the appropriate model

since passing the model class at url include time doesn't work.
This commit is contained in:
Jeff Bradberry
2019-08-19 15:13:34 -04:00
parent 771ef275d4
commit 6b86cf6e86
3 changed files with 21 additions and 5 deletions

View File

@@ -11,6 +11,7 @@ from rest_framework.response import Response
from awx.api import serializers
from awx.api.generics import APIView, GenericAPIView
from awx.api.permissions import WebhookKeyPermission
from awx.main.models import JobTemplate, WorkflowJobTemplate
# NOTE: The model class attribute for these views must be added
# dynamically when including urls/webhooks.py
@@ -20,6 +21,15 @@ class WebhookKeyView(GenericAPIView):
serializer_class = serializers.EmptySerializer
permission_classes = (WebhookKeyPermission,)
def get_queryset(self):
qs_models = {
'job_templates': JobTemplate,
'workflow_job_templates': WorkflowJobTemplate,
}
self.model = qs_models.get(self.kwargs['model_kwarg'])
return super().get_queryset()
def get(self, request, *args, **kwargs):
obj = self.get_object()
@@ -41,7 +51,15 @@ class WebhookReceiverBase(APIView):
return super().dispatch(*args, **kwargs)
def get_queryset(self):
return self.model.objects.filter(webhook_service=self.service)
qs_models = {
'job_templates': JobTemplate,
'workflow_job_templates': WorkflowJobTemplate,
}
model = qs_models.get(self.kwargs['model_kwarg'])
if model is None:
raise PermissionDenied
return model.objects.filter(webhook_service=self.service)
def get_object(self):
queryset = self.get_queryset()