Ticket #10838: comments.diff

django/contrib/comments/templatetags/comments.py

@@ -123 +123 @@
 
     def get_form(self, context):
         ctype, object_pk = self.get_target_ctype_pk(context)
+        user = context.get('user', None)
         if object_pk:
-            return comments.get_form()(ctype.get_object_for_this_type(pk=object_pk))
+            return comments.get_form()(ctype.get_object_for_this_type(pk=object_pk), user=user)
         else:
             return None
 

django/contrib/comments/views/comments.py

@@ -61 +61 @@
     preview = "preview" in data
 
     # Construct the comment form
-    form = comments.get_form()(target, data=data)
+    form = comments.get_form()(target, data=data, user=request.user)
 
     # Check security information
     if form.security_errors():

django/contrib/comments/forms.py

@@ -96 +96 @@
     comment       = forms.CharField(label=_('Comment'), widget=forms.Textarea,
                                     max_length=COMMENT_MAX_LENGTH)
 
+    def __init__(self, target_object, data=None, initial=None, user=None):
+        self.user = user
+        if initial is None:
+            initial = {}
+        if user and user.is_authenticated():
+            initial.update({"name":user.get_full_name() or user.username,
+                                   "email":user.email})
+        super(CommentDetailsForm, self).__init__(target_object, data=data, initial=initial)
+
     def get_comment_object(self):
         """
         Return a new (unsaved) comment object based on the information in this