Django

Code

Changeset 9118

Show
Ignore:
Timestamp:
10/05/08 00:07:32 (3 months ago)
Author:
mtredinnick
Message:

Fixed #8803 -- Allow authenticated users without first_name/last_name values set to post comments.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/django/contrib/comments/views/comments.py

    r8751 r9118  
    3838    if request.user.is_authenticated(): 
    3939        if not data.get('name', ''): 
    40             data["name"] = request.user.get_full_name() 
     40            data["name"] = request.user.get_full_name() or request.user.username 
    4141        if not data.get('email', ''): 
    4242            data["email"] = request.user.email 
  • django/trunk/tests/regressiontests/comment_tests/tests/comment_view_tests.py

    r8751 r9118  
    8686        self.assertEqual(c.ip_address, "1.2.3.4") 
    8787        self.assertEqual(c.comment, "This is my comment") 
    88          
     88 
    8989    def testPostAsAuthenticatedUser(self): 
    9090        a = Article.objects.get(pk=1) 
     
    101101        self.assertEqual(c.user_name, u.get_full_name()) 
    102102        self.assertEqual(c.user_email, u.email) 
     103 
     104    def testPostAsAuthenticatedUserWithoutFullname(self): 
     105        """ 
     106        Check that the user's name in the comment is populated for 
     107        authenticated users without first_name and last_name. 
     108        """ 
     109        user = User.objects.create_user(username='jane_other', 
     110                email='jane@example.com', password='jane_other') 
     111        a = Article.objects.get(pk=1) 
     112        data = self.getValidData(a) 
     113        data['name'] = data['email'] = '' 
     114        self.client.login(username="jane_other", password="jane_other") 
     115        self.response = self.client.post("/post/", data, REMOTE_ADDR="1.2.3.4") 
     116        c = Comment.objects.get(user=user) 
     117        self.assertEqual(c.ip_address, "1.2.3.4") 
     118        self.assertEqual(c.user_name, 'jane_other') 
     119        user.delete() 
    103120 
    104121    def testPreventDuplicateComments(self): 
     
    132149        self.testCreateValidComment() 
    133150        self.assertEqual(received_signals, excepted_signals) 
    134          
     151 
    135152    def testWillBePostedSignal(self): 
    136153        """