starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-04-01 07:03:22 +02:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

Merge branch 'develop' into api2

Browse Source 
Conflicts:
	netbox/templates/users/_user.html
	netbox/users/urls.py
This commit is contained in:
Jeremy Stretch
2017-03-14 12:40:28 -04:00
parent 105d17748e d9f1bcbf15
commit 04aedcc056
14 changed files with 71 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/secrets/decorators.py
View File

@@ -15,10 +15,10 @@ def userkey_required():
uk = UserKey.objects.get(user=request.user)
except UserKey.DoesNotExist:
messages.warning(request, u"This operation requires an active user key, but you don't have one.")
return redirect('users:userkey')
return redirect('user:userkey')
if not uk.is_active():
messages.warning(request, u"This operation is not available. Your user key has not been activated.")
return redirect('users:userkey')
return redirect('user:userkey')
return view(request, *args, **kwargs)
return wrapped_view
return _decorator