nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make user edit and change password non-admin views

Browse Source 
- This makes the user update and password change pages non admin so that
  non admin users can access
This commit is contained in:
lispyclouds 2017-02-13 11:48:10 +05:30 committed by Sunil Mohan Adapa
parent 3e0f7a007e
commit 79b27ea2ee
No known key found for this signature in database
GPG Key ID: 43EA1CFF0AA7C5F2
3 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
plinth/modules/users/templates/users_change_password.html
View File

@ -21,27 +21,22 @@
{% load bootstrap %} {% load bootstrap %}
{% load i18n %} {% load i18n %}
{% block content %} {% block content_row %}
<div class="col-md-6 col-md-offset-3">
<h3>
{% blocktrans trimmed with username=form.user.username %}
Change Password for <em>{{ username }}</em>
{% endblocktrans %}
</h3>
<form class="form" method="post">
{% csrf_token %}
<h3> {{ form|bootstrap }}
{% blocktrans trimmed with username=form.user.username %}
Change Password for <em>{{ username }}</em>
{% endblocktrans %}
</h3>
<div class="row"> <input type="submit" class="btn btn-primary"
<div class="col-sm-6"> value="{% trans "Save Password" %}"/>
<form class="form" method="post"> </form>
{% csrf_token %}
{{ form|bootstrap }}
<input type="submit" class="btn btn-primary"
value="{% trans "Save Password" %}"/>
</form>
</div>
</div> </div>
{% endblock %} {% endblock %}
{% block page_js %} {% block page_js %}

36
plinth/modules/users/templates/users_update.html
View File

@ -29,32 +29,28 @@
</style> </style>
{% endblock %} {% endblock %}
{% block content %} {% block content_row %}
<div class="col-md-6 col-md-offset-3">
<h3>{{ object.username }}</h3>
<h3>{{ object.username }}</h3> <p>
{% url 'users:change_password' object.username as change_password_url %}
<p> {% blocktrans trimmed %}
{% url 'users:change_password' object.username as change_password_url %} Use the <a href='{{ change_password_url }}'>change password form
</a> to change the password.
{% endblocktrans %}
</p>
{% blocktrans trimmed %} <form class="form" method="post">
Use the <a href='{{ change_password_url }}'>change password form {% csrf_token %}
</a> to change the password.
{% endblocktrans %}
</p>
<div class="row"> {{ form|bootstrap }}
<div class="col-sm-8">
<form class="form" method="post">
{% csrf_token %}
{{ form|bootstrap }} <input type="submit" class="btn btn-primary"
value="{% trans "Save Changes" %}"/>
<input type="submit" class="btn btn-primary" </form>
value="{% trans "Save Changes" %}"/>
</form>
</div>
</div> </div>
{% endblock %} {% endblock %}
{% block page_js %} {% block page_js %}

5
plinth/modules/users/urls.py
View File

@ -24,18 +24,19 @@ from django.contrib.auth import views as auth_views
from django.urls import reverse_lazy from django.urls import reverse_lazy
from stronghold.decorators import public from stronghold.decorators import public
from plinth.utils import non_admin_view
from . import views from . import views
urlpatterns = [ urlpatterns = [
url(r'^sys/users/$', views.UserList.as_view(), name='index'), url(r'^sys/users/$', views.UserList.as_view(), name='index'),
url(r'^sys/users/create/$', views.UserCreate.as_view(), name='create'), url(r'^sys/users/create/$', views.UserCreate.as_view(), name='create'),
url(r'^sys/users/(?P<slug>[\w.@+-]+)/edit/$', views.UserUpdate.as_view(), url(r'^sys/users/(?P<slug>[\w.@+-]+)/edit/$', non_admin_view(views.UserUpdate.as_view()),
name='edit'), name='edit'),
url(r'^sys/users/(?P<slug>[\w.@+-]+)/delete/$', views.UserDelete.as_view(), url(r'^sys/users/(?P<slug>[\w.@+-]+)/delete/$', views.UserDelete.as_view(),
name='delete'), name='delete'),
url(r'^sys/users/(?P<slug>[\w.@+-]+)/change_password/$', url(r'^sys/users/(?P<slug>[\w.@+-]+)/change_password/$',
views.UserChangePassword.as_view(), name='change_password'), non_admin_view(views.UserChangePassword.as_view()), name='change_password'),
# Add Django's login/logout urls # Add Django's login/logout urls
url(r'^accounts/login/$', public(auth_views.login), url(r'^accounts/login/$', public(auth_views.login),
{'template_name': 'login.html'}, name='login'), {'template_name': 'login.html'}, name='login'),