Hopiu/django-admin2
1
0
Fork 0
mirror of https://github.com/jazzband/django-admin2.git synced 2026-04-08 00:41:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed names

Browse source
This commit is contained in:
d1ffuz0r 2013-05-31 08:25:45 +07:00
parent 8dd3cd4133
commit db939ef753
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
djadmin2/core.py
View file

@ -127,11 +127,11 @@ class Admin2(object):
),
url(regex='^auth/user/(?P<pk>\d+)/update/password/$',
view=views.PasswordChangeView.as_view(),
name='password-change'
name='password_change'
),
url(regex='^password_change_done/$',
view=views.PasswordChangeDoneView.as_view(),
name='password-change-done'
name='password_change_done'
),
url(regex='^logout/$',
view=views.LogoutView.as_view(),

2
djadmin2/templates/admin2/bootstrap/base.html
View file

@ -36,7 +36,7 @@
</a>
<ul class="dropdown-menu">
{% if user.has_usable_password %}
<li><a href="{% url 'admin2:password-change' user.id %}">{% trans "Change password" %}</a></li>
<li><a href="{% url 'admin2:password_change' user.id %}">{% trans "Change password" %}</a></li>
{% endif %}
<li><a href="{% url 'admin2:logout' %}">{% trans "Log out" %}</a></li>
</ul>

2
djadmin2/views.py
View file

@ -142,7 +142,7 @@ class PasswordChangeView(Admin2Mixin, generic.UpdateView):
form_class = AdminPasswordChangeForm
admin_form_class = PasswordChangeForm
model = get_user_model()
success_url = reverse_lazy('admin2:password-change-done')
success_url = reverse_lazy('admin2:password_change_done')
def get_form_kwargs(self, **kwargs):
data = {'user': self.get_object()}

8
example/blog/tests/test_views.py
View file

@ -185,12 +185,12 @@ class TestAuthViews(TestCase):
def test_change_password_for_myself(self):
self.client.login(username=self.user.username,
password='password')
request = self.client.post(reverse('admin2:password-change',
request = self.client.post(reverse('admin2:password_change',
kwargs={'pk': self.user.pk}),
{'old_password': 'password',
'new_password1': 'user',
'new_password2': 'user'})
self.assertRedirects(request, reverse('admin2:password-change-done'))
self.assertRedirects(request, reverse('admin2:password_change_done'))
self.client.logout()
self.assertFalse(self.client.login(username=self.user.username,
@ -206,12 +206,12 @@ class TestAuthViews(TestCase):
new_user.set_password("new_user")
new_user.save()
request = self.client.post(reverse('admin2:password-change',
request = self.client.post(reverse('admin2:password_change',
kwargs={'pk': new_user.pk}),
{'old_password': 'new_user',
'password1': 'new_user_password',
'password2': 'new_user_password'})
self.assertRedirects(request, reverse('admin2:password-change-done'))
self.assertRedirects(request, reverse('admin2:password_change_done'))
self.client.logout()
self.assertFalse(self.client.login(username=new_user.username,