Commit 4035ea35 authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

A few small fixes to django.contrib.comments (Comment.get_as_text for... 

A few small fixes to django.contrib.comments (Comment.get_as_text for non-authenticated users; references to Comment.permalink; unused imports). Fixes #9143, #9429, and 9439. Thanks, Thejaswi Puthraya.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9730 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 11d382c6

django/contrib/comments/admin.py

+0 −1
Original line number Diff line number Diff line 
from django.contrib import admin

from django.conf import settings

from django.contrib.comments.models import Comment

from django.utils.translation import ugettext_lazy as _

django/contrib/comments/forms.py

+0 −2
Original line number Diff line number Diff line 
import re

import time

import datetime



from django import forms

from django.forms.util import ErrorDict

from django.conf import settings

from django.http import Http404

from django.contrib.contenttypes.models import ContentType

from models import Comment

from django.utils.encoding import force_unicode

django/contrib/comments/managers.py

+0 −1
Original line number Diff line number Diff line 
from django.db import models

from django.dispatch import dispatcher

from django.contrib.contenttypes.models import ContentType

from django.utils.encoding import force_unicode

django/contrib/comments/models.py

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ class Comment(BaseCommentAbstractModel): 
        Return this comment as plain text.  Useful for emails.

        """

        d = {

            'user': self.user,

            'user': self.user or self.name,

            'date': self.submit_date,

            'comment': self.comment,

            'domain': self.site.domain,

django/contrib/comments/templates/comments/approve.html

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
  <form action="." method="post">

    <input type="hidden" name="next" value="{{ next }}" id="next" />

    <p class="submit">

      <input type="submit" name="submit" value="{% trans "Approve" %}" /> or <a href="{{ comment.permalink }}">cancel</a>

      <input type="submit" name="submit" value="{% trans "Approve" %}" /> or <a href="{{ comment.get_absolute_url }}">cancel</a>

    </p>

  </form>

{% endblock %}