mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #4968: Fix exception when activating user keys in admin UI

Browse Source
This commit is contained in:
Jeremy Stretch
2020-08-07 12:06:53 -04:00
parent 09015c98c4
commit 1dfed14bc9
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.9.md
View File

@ -24,6 +24,7 @@
* [#4950](https://github.com/netbox-community/netbox/issues/4950) - Include inventory item label in API serializer, UI view * [#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 * [#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 * [#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 ### Other Changes

5
netbox/secrets/admin.py
View File

@ -1,4 +1,5 @@
from django.contrib import admin, messages from django.contrib import admin, messages
from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
from django.shortcuts import redirect, render from django.shortcuts import redirect, render
from .forms import ActivateUserKeyForm 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' request, "Invalid private key provided. Unable to retrieve master key.", extra_tags='error'
) )
else: 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', { return render(request, 'activate_keys.html', {
'form': form, 'form': form,