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 v2-develop

Browse Source
This commit is contained in:
Jeremy Stretch
2017-05-08 15:02:06 -04:00
committed by GitHub
parent af4edff370 f40c048475
commit 5ca87c0f20
34 changed files with 888 additions and 861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
netbox/secrets/views.py
View File

@@ -221,6 +221,7 @@ def secret_import(request):
return render(request, 'import_success.html', {
'table': table,
'return_url': 'secrets:secret_list',
})
except IntegrityError as e:
@@ -231,7 +232,7 @@ def secret_import(request):
return render(request, 'secrets/secret_import.html', {
'form': form,
'return_url': reverse('secrets:secret_list'),
'return_url': 'secrets:secret_list',
})