Fixed #8803 -- Allow authenticated users without first_name/last_name values set to post comments.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9118 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
16d0a615c4
commit
227a93b64f
|
@ -37,7 +37,7 @@ def post_comment(request, next=None):
|
||||||
data = request.POST.copy()
|
data = request.POST.copy()
|
||||||
if request.user.is_authenticated():
|
if request.user.is_authenticated():
|
||||||
if not data.get('name', ''):
|
if not data.get('name', ''):
|
||||||
data["name"] = request.user.get_full_name()
|
data["name"] = request.user.get_full_name() or request.user.username
|
||||||
if not data.get('email', ''):
|
if not data.get('email', ''):
|
||||||
data["email"] = request.user.email
|
data["email"] = request.user.email
|
||||||
|
|
||||||
|
|
|
@ -101,6 +101,23 @@ class CommentViewTests(CommentTestCase):
|
||||||
self.assertEqual(c.user_name, u.get_full_name())
|
self.assertEqual(c.user_name, u.get_full_name())
|
||||||
self.assertEqual(c.user_email, u.email)
|
self.assertEqual(c.user_email, u.email)
|
||||||
|
|
||||||
|
def testPostAsAuthenticatedUserWithoutFullname(self):
|
||||||
|
"""
|
||||||
|
Check that the user's name in the comment is populated for
|
||||||
|
authenticated users without first_name and last_name.
|
||||||
|
"""
|
||||||
|
user = User.objects.create_user(username='jane_other',
|
||||||
|
email='jane@example.com', password='jane_other')
|
||||||
|
a = Article.objects.get(pk=1)
|
||||||
|
data = self.getValidData(a)
|
||||||
|
data['name'] = data['email'] = ''
|
||||||
|
self.client.login(username="jane_other", password="jane_other")
|
||||||
|
self.response = self.client.post("/post/", data, REMOTE_ADDR="1.2.3.4")
|
||||||
|
c = Comment.objects.get(user=user)
|
||||||
|
self.assertEqual(c.ip_address, "1.2.3.4")
|
||||||
|
self.assertEqual(c.user_name, 'jane_other')
|
||||||
|
user.delete()
|
||||||
|
|
||||||
def testPreventDuplicateComments(self):
|
def testPreventDuplicateComments(self):
|
||||||
"""Prevent posting the exact same comment twice"""
|
"""Prevent posting the exact same comment twice"""
|
||||||
a = Article.objects.get(pk=1)
|
a = Article.objects.get(pk=1)
|
||||||
|
|
Loading…
Reference in New Issue