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

Merge branch 'develop' into develop-2.1

Browse Source 
Conflicts:
	netbox/netbox/settings.py
This commit is contained in:
Jeremy Stretch
2017-07-14 10:12:35 -04:00
parent b2d3f3ff22 0655834938
commit e8dafc02f7
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
netbox/secrets/admin.py
View File

@ -42,13 +42,15 @@ class UserKeyAdmin(admin.ModelAdmin):
if 'activate' in request.POST:
form = ActivateUserKeyForm(request.POST)
if form.is_valid():
try:
master_key = my_userkey.get_master_key(form.cleaned_data['secret_key'])
master_key = my_userkey.get_master_key(form.cleaned_data['secret_key'])
if master_key is not None:
for uk in form.cleaned_data['_selected_action']:
uk.activate(master_key)
return redirect('admin:secrets_userkey_changelist')
except ValueError:
messages.error(request, "Invalid private key provided. Unable to retrieve master key.")
else:
messages.error(
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)})

2
netbox/secrets/forms.py
View File

@ -40,7 +40,7 @@ class SecretRoleForm(BootstrapMixin, forms.ModelForm):
class Meta:
model = SecretRole
fields = ['name', 'slug']
fields = ['name', 'slug', 'users', 'groups']
#