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 #1206: Fix redirection in admin UI after activating secret keys when BASE_PATH is set

Browse Source
This commit is contained in:
Jeremy Stretch
2017-05-19 13:23:17 -04:00
parent eece8a0e26
commit 27c94d9874
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/secrets/admin.py
View File

@ -35,7 +35,7 @@ class UserKeyAdmin(admin.ModelAdmin):
my_userkey = UserKey.objects.get(user=request.user) my_userkey = UserKey.objects.get(user=request.user)
except UserKey.DoesNotExist: except UserKey.DoesNotExist:
messages.error(request, u"You do not have an active User Key.") messages.error(request, u"You do not have an active User Key.")
return redirect('/admin/secrets/userkey/') return redirect('admin:secrets_userkey_changelist')
if 'activate' in request.POST: if 'activate' in request.POST:
form = ActivateUserKeyForm(request.POST) form = ActivateUserKeyForm(request.POST)
@ -44,7 +44,7 @@ class UserKeyAdmin(admin.ModelAdmin):
master_key = my_userkey.get_master_key(form.cleaned_data['secret_key']) master_key = my_userkey.get_master_key(form.cleaned_data['secret_key'])
for uk in form.cleaned_data['_selected_action']: for uk in form.cleaned_data['_selected_action']:
uk.activate(master_key) uk.activate(master_key)
return redirect('/admin/secrets/userkey/') return redirect('admin:secrets_userkey_changelist')
except ValueError: except ValueError:
messages.error(request, u"Invalid private key provided. Unable to retrieve master key.") messages.error(request, u"Invalid private key provided. Unable to retrieve master key.")
else: else: