NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-18 11:22:25 -06:00
Code Issues Actions 10 Packages Projects Releases 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

16
netbox/users/urls.py
View File

@@ -7,13 +7,13 @@ urlpatterns = [
# User profiles
url(r'^profile/$', views.profile, name='profile'),
url(r'^profile/password/$', views.change_password, name='change_password'),
url(r'^profile/api-tokens/$', views.TokenListView.as_view(), name='token_list'),
url(r'^profile/api-tokens/add/$', views.TokenEditView.as_view(), name='token_add'),
url(r'^profile/api-tokens/(?P<pk>\d+)/edit/$', views.TokenEditView.as_view(), name='token_edit'),
url(r'^profile/api-tokens/(?P<pk>\d+)/delete/$', views.TokenDeleteView.as_view(), name='token_delete'),
url(r'^profile/user-key/$', views.userkey, name='userkey'),
url(r'^profile/user-key/edit/$', views.userkey_edit, name='userkey_edit'),
url(r'^profile/recent-activity/$', views.recent_activity, name='recent_activity'),
url(r'^password/$', views.change_password, name='change_password'),
url(r'^api-tokens/$', views.TokenListView.as_view(), name='token_list'),
url(r'^api-tokens/add/$', views.TokenEditView.as_view(), name='token_add'),
url(r'^api-tokens/(?P<pk>\d+)/edit/$', views.TokenEditView.as_view(), name='token_edit'),
url(r'^api-tokens/(?P<pk>\d+)/delete/$', views.TokenDeleteView.as_view(), name='token_delete'),
url(r'^user-key/$', views.userkey, name='userkey'),
url(r'^user-key/edit/$', views.userkey_edit, name='userkey_edit'),
url(r'^recent-activity/$', views.recent_activity, name='recent_activity'),
]

4
netbox/users/views.py
View File

@@ -72,7 +72,7 @@ def change_password(request):
form.save()
update_session_auth_hash(request, form.user)
messages.success(request, u"Your password has been changed successfully.")
return redirect('users:profile')
return redirect('user:profile')
else:
form = PasswordChangeForm(user=request.user)
@@ -112,7 +112,7 @@ def userkey_edit(request):
uk.user = request.user
uk.save()
messages.success(request, u"Your user key has been saved.")
return redirect('users:userkey')
return redirect('user:userkey')
else:
form = UserKeyForm(instance=userkey)