From 1dfed14bc9c344ac46ac2471603108e9ccbd6411 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 7 Aug 2020 12:06:53 -0400 Subject: [PATCH] Fixes #4968: Fix exception when activating user keys in admin UI --- docs/release-notes/version-2.9.md | 1 + netbox/secrets/admin.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md index 6097daee3..bddb08336 100644 --- a/docs/release-notes/version-2.9.md +++ b/docs/release-notes/version-2.9.md @@ -24,6 +24,7 @@ * [#4950](https://github.com/netbox-community/netbox/issues/4950) - Include inventory item label in API serializer, UI view * [#4951](https://github.com/netbox-community/netbox/issues/4951) - Redirect to device inventory view after creating a new inventory item * [#4952](https://github.com/netbox-community/netbox/issues/4952) - Default to VM tab when creating/editing an IP address for a VM +* [#4968](https://github.com/netbox-community/netbox/issues/4968) - Fix exception when activating user keys in admin UI ### Other Changes diff --git a/netbox/secrets/admin.py b/netbox/secrets/admin.py index e11128674..ceb6e0426 100644 --- a/netbox/secrets/admin.py +++ b/netbox/secrets/admin.py @@ -1,4 +1,5 @@ from django.contrib import admin, messages +from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME from django.shortcuts import redirect, render from .forms import ActivateUserKeyForm @@ -50,7 +51,9 @@ class UserKeyAdmin(admin.ModelAdmin): request, "Invalid private key provided. Unable to retrieve master key.", extra_tags='error' ) else: - form = ActivateUserKeyForm(initial={'_selected_action': request.POST.getlist(admin.ACTION_CHECKBOX_NAME)}) + form = ActivateUserKeyForm( + initial={'_selected_action': request.POST.getlist(ACTION_CHECKBOX_NAME)} + ) return render(request, 'activate_keys.html', { 'form': form,