From a88f1442399f95d2fef4b4dea3b4c09b7c5df2a5 Mon Sep 17 00:00:00 2001 From: Matthias Date: Thu, 4 Nov 2021 10:17:39 +0100 Subject: [PATCH] merge fixes --- InvenTree/common/admin.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/InvenTree/common/admin.py b/InvenTree/common/admin.py index 6aa31bcd0d..cd521f8b38 100644 --- a/InvenTree/common/admin.py +++ b/InvenTree/common/admin.py @@ -23,12 +23,6 @@ class WebhookAdmin(ImportExportModelAdmin): list_display = ('endpoint_id', 'name', 'active', 'user') -admin.site.register(common.models.InvenTreeSetting, SettingsAdmin) -admin.site.register(common.models.InvenTreeUserSetting, UserSettingsAdmin) -admin.site.register(common.models.WebhookEndpoint, WebhookAdmin) -admin.site.register(common.models.WebhookMessage, ImportExportModelAdmin) - - class NotificationEntryAdmin(admin.ModelAdmin): list_display = ('key', 'uid', 'updated', ) @@ -36,4 +30,6 @@ class NotificationEntryAdmin(admin.ModelAdmin): admin.site.register(common.models.InvenTreeSetting, SettingsAdmin) admin.site.register(common.models.InvenTreeUserSetting, UserSettingsAdmin) +admin.site.register(common.models.WebhookEndpoint, WebhookAdmin) +admin.site.register(common.models.WebhookMessage, ImportExportModelAdmin) admin.site.register(common.models.NotificationEntry, NotificationEntryAdmin)