NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-22 12:06:53 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Renamed user URL namespace

Browse Source
This commit is contained in:
Jeremy Stretch 2017-03-14 12:36:44 -04:00
parent 4b7af8d3b4
commit d9f1bcbf15
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/netbox/urls.py
View File

@ -23,7 +23,7 @@ _patterns = [
url(r'^ipam/', include('ipam.urls', namespace='ipam')),
url(r'^secrets/', include('secrets.urls', namespace='secrets')),
url(r'^tenancy/', include('tenancy.urls', namespace='tenancy')),
url(r'^profile/', include('users.urls', namespace='users')),
url(r'^user/', include('users.urls', namespace='user')),
# API
url(r'^api/circuits/', include('circuits.api.urls', namespace='circuits-api')),

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

2
netbox/templates/_base.html
View File

@ -245,7 +245,7 @@
{% if request.user.is_staff %}
<li><a href="{% url 'admin:index' %}"><i class="fa fa-cogs" aria-hidden="true"></i> Admin</a></li>
{% endif %}
<li><a href="{% url 'users:profile' %}"><i class="fa fa-user" aria-hidden="true"></i> {{ request.user }}</a></li>
<li><a href="{% url 'user:profile' %}"><i class="fa fa-user" aria-hidden="true"></i> {{ request.user }}</a></li>
<li><a href="{% url 'logout' %}"><i class="fa fa-sign-out" aria-hidden="true"></i> Log out</a></li>
{% else %}
<li><a href="{% url 'login' %}?next={{ request.path }}"><i class="fa fa-sign-in" aria-hidden="true"></i> Log in</a></li>

8
netbox/templates/users/_user.html
View File

@ -9,10 +9,10 @@
<div class="row">
<div class="col-sm-3 col-md-2 col-md-offset-2">
<ul class="nav nav-pills nav-stacked">
<li{% ifequal active_tab "profile" %} class="active"{% endifequal %}><a href="{% url 'users:profile' %}">Profile</a></li>
<li{% ifequal active_tab "change_password" %} class="active"{% endifequal %}><a href="{% url 'users:change_password' %}">Change Password</a></li>
<li{% ifequal active_tab "userkey" %} class="active"{% endifequal %}><a href="{% url 'users:userkey' %}">User Key</a></li>
<li{% ifequal active_tab "recent_activity" %} class="active"{% endifequal %}><a href="{% url 'users:recent_activity' %}">Recent Activity</a></li>
<li{% ifequal active_tab "profile" %} class="active"{% endifequal %}><a href="{% url 'user:profile' %}">Profile</a></li>
<li{% ifequal active_tab "change_password" %} class="active"{% endifequal %}><a href="{% url 'user:change_password' %}">Change Password</a></li>
<li{% ifequal active_tab "userkey" %} class="active"{% endifequal %}><a href="{% url 'user:userkey' %}">User Key</a></li>
<li{% ifequal active_tab "recent_activity" %} class="active"{% endifequal %}><a href="{% url 'user:recent_activity' %}">Recent Activity</a></li>
</ul>
</div>
<div class="col-sm-9 col-md-6">

2
netbox/templates/users/change_password.html
View File

@ -24,7 +24,7 @@
</div>
<div class="text-right">
<button type="submit" name="_update" class="btn btn-primary">Update</button>
<a href="{% url 'users:profile' %}" class="btn btn-default">Cancel</a>
<a href="{% url 'user:profile' %}" class="btn btn-default">Cancel</a>
</div>
</form>
{% endblock %}

4
netbox/templates/users/userkey.html
View File

@ -15,7 +15,7 @@
<p>Your public key is below.</p>
<pre>{{ userkey.public_key }}</pre>
<div class="pull-right">
<a href="{% url 'users:userkey_edit' %}" class="btn btn-warning">
<a href="{% url 'user:userkey_edit' %}" class="btn btn-warning">
<span class="fa fa-pencil" aria-hidden="true"></span>
Edit user key
</a>
@ -24,7 +24,7 @@
{% else %}
<p>You don't have a user key on file.</p>
<p>
<a href="{% url 'users:userkey_edit' %}" class="btn btn-primary">
<a href="{% url 'user:userkey_edit' %}" class="btn btn-primary">
<span class="fa fa-plus" aria-hidden="true"></span>
Create a User Key
</a>

2
netbox/templates/users/userkey_edit.html
View File

@ -23,7 +23,7 @@
</div>
<div class="col-sm-6 col-md-6 text-right">
<button type="submit" name="_update" class="btn btn-primary">Save</button>
<a href="{% url 'users:userkey' %}" class="btn btn-default">Cancel</a>
<a href="{% url 'user:userkey' %}" class="btn btn-default">Cancel</a>
</div>
</div>
</div>

8
netbox/users/urls.py
View File

@ -7,9 +7,9 @@ urlpatterns = [
# User profiles
url(r'^profile/$', views.profile, name='profile'),
url(r'^profile/password/$', views.change_password, name='change_password'),
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'^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

@ -69,7 +69,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)
@ -109,7 +109,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)