From 0dcab07519f8dcb87fecc73c734631b48f3a4d35 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Tue, 4 Dec 2018 00:40:54 -0500 Subject: [PATCH] fixes #2623 - model class being passed to rqworker --- netbox/extras/webhooks.py | 2 +- netbox/extras/webhooks_worker.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/netbox/extras/webhooks.py b/netbox/extras/webhooks.py index a0c927b64..35ec56feb 100644 --- a/netbox/extras/webhooks.py +++ b/netbox/extras/webhooks.py @@ -45,7 +45,7 @@ def enqueue_webhooks(instance, action): "extras.webhooks_worker.process_webhook", webhook, serializer.data, - instance.__class__, + instance._meta.model_name, action, str(datetime.datetime.now()) ) diff --git a/netbox/extras/webhooks_worker.py b/netbox/extras/webhooks_worker.py index 2122d1154..30f86f311 100644 --- a/netbox/extras/webhooks_worker.py +++ b/netbox/extras/webhooks_worker.py @@ -10,14 +10,14 @@ from extras.constants import WEBHOOK_CT_JSON, WEBHOOK_CT_X_WWW_FORM_ENCODED, OBJ @job('default') -def process_webhook(webhook, data, model_class, event, timestamp): +def process_webhook(webhook, data, model_name, event, timestamp): """ Make a POST request to the defined Webhook """ payload = { 'event': dict(OBJECTCHANGE_ACTION_CHOICES)[event].lower(), 'timestamp': timestamp, - 'model': model_class._meta.model_name, + 'model': model_name, 'data': data } headers = {