p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #20881 -- Removed contrib.auth.models.AbstractUser.get_absolute_url() 

The definition is arbitrary and creates a broken "view on site"
link in the admin if a project doesn't define such a URL.
This commit is contained in:
Tim Graham 2013-08-28 20:03:21 -04:00
parent 8d473b2c54
commit cf8d6e9108
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/contrib/auth/models.py
View File

@ -386,9 +386,6 @@ class AbstractUser(AbstractBaseUser, PermissionsMixin):
verbose_name_plural = _('users') verbose_name_plural = _('users')
abstract = True abstract = True
def get_absolute_url(self):
return "/users/%s/" % urlquote(self.username)
def get_full_name(self): def get_full_name(self):
""" """
Returns the first_name plus the last_name, with a space in between. Returns the first_name plus the last_name, with a space in between.

7
docs/releases/1.7.txt
View File

@ -323,6 +323,13 @@ Miscellaneous
when called on an instance without a primary key value. This is done to when called on an instance without a primary key value. This is done to
avoid mutable ``__hash__`` values in containers. avoid mutable ``__hash__`` values in containers.
* ``django.contrib.auth.models.AbstractUser`` no longer defines a
:meth:`~django.db.models.Model.get_absolute_url()` method. The old definition
returned ``"/users/%s/" % urlquote(self.username)`` which was arbitrary
since applications may or may not define such a url in ``urlpatterns``.
Define a ``get_absolute_url()`` method on your own custom user object or use
:setting:`ABSOLUTE_URL_OVERRIDES` if you want a URL for your user.
Features deprecated in 1.7 Features deprecated in 1.7
========================== ==========================

8
tests/admin_views/tests.py
View File

@ -1749,9 +1749,9 @@ class SecureViewTests(TestCase):
""" """
Only admin users should be able to use the admin shortcut view. Only admin users should be able to use the admin shortcut view.
""" """
user_ctype = ContentType.objects.get_for_model(User) model_ctype = ContentType.objects.get_for_model(ModelWithStringPrimaryKey)
user = User.objects.get(username='super') obj = ModelWithStringPrimaryKey.objects.create(string_pk='foo')
shortcut_url = "/test_admin/admin/r/%s/%s/" % (user_ctype.pk, user.pk) shortcut_url = "/test_admin/admin/r/%s/%s/" % (model_ctype.pk, obj.pk)
# Not logged in: we should see the login page. # Not logged in: we should see the login page.
response = self.client.get(shortcut_url, follow=False) response = self.client.get(shortcut_url, follow=False)
@ -1762,7 +1762,7 @@ class SecureViewTests(TestCase):
response = self.client.get(shortcut_url, follow=False) response = self.client.get(shortcut_url, follow=False)
# Can't use self.assertRedirects() because User.get_absolute_url() is silly. # Can't use self.assertRedirects() because User.get_absolute_url() is silly.
self.assertEqual(response.status_code, 302) self.assertEqual(response.status_code, 302)
self.assertEqual(response.url, 'http://example.com/users/super/') self.assertEqual(response.url, 'http://example.com/dummy/foo/')
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))