Commit 78f66691 authored by Claude Paroz's avatar Claude Paroz
Browse files

Fixed #8627 -- Prevented textareas to swallow first newline content 

Browsers consider the first newline in textareas as some display
artifact, not real content. Hence they are not sending it back to
the server. If we want to keep initial newlines, we have to add one
when we render the textarea.
Thanks bastih for the report and initial patch.
parent 39ec43b4

django/forms/widgets.py

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ class Textarea(Widget): 
    def render(self, name, value, attrs=None):

        if value is None: value = ''

        final_attrs = self.build_attrs(attrs, name=name)

        return format_html('<textarea{0}>{1}</textarea>',

        return format_html('<textarea{0}>\r\n{1}</textarea>',

                           flatatt(final_attrs),

                           force_text(value))

tests/regressiontests/forms/models.py

+5 −1
Original line number Diff line number Diff line
@@ -84,3 +84,7 @@ class Group(models.Model): 


class Cheese(models.Model):

    name = models.CharField(max_length=100)





class Article(models.Model):

    content = models.TextField()

tests/regressiontests/forms/templates/forms/article_form.html

0 → 100644
+8 −0
Original line number Diff line number Diff line 
<html>

<body>

  <form method="post" action=".">

    {{ form.as_p }}<br>

    <input id="submit" type="submit">

  </form>

</body>

</html>

tests/regressiontests/forms/tests/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ from .regressions import FormsRegressionsTestCase 
from .util import FormsUtilTestCase

from .validators import TestFieldWithValidators

from .widgets import (FormsWidgetTestCase, FormsI18NWidgetsTestCase,

    WidgetTests, ClearableFileInputTests)
 
    WidgetTests, LiveWidgetTests, ClearableFileInputTests)

tests/regressiontests/forms/tests/widgets.py

+20 −0
Original line number Diff line number Diff line
@@ -4,7 +4,9 @@ from __future__ import unicode_literals 
import copy

import datetime



from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase

from django.core.files.uploadedfile import SimpleUploadedFile

from django.core.urlresolvers import reverse

from django.forms import *

from django.forms.widgets import RadioFieldRenderer

from django.utils import formats
@@ -15,6 +17,8 @@ from django.test import TestCase 
from django.test.utils import override_settings

from django.utils.encoding import python_2_unicode_compatible



from ..models import Article





class FormsWidgetTestCase(TestCase):

    # Each Widget class corresponds to an HTML form widget. A Widget knows how to
@@ -1095,6 +1099,22 @@ class WidgetTests(TestCase): 
        self.assertFalse(form.is_valid())





class LiveWidgetTests(AdminSeleniumWebDriverTestCase):

    urls = 'regressiontests.forms.urls'



    def test_textarea_trailing_newlines(self):

        """

        Test that a roundtrip on a ModelForm doesn't alter the TextField value

        """

        article = Article.objects.create(content="\nTst\n")

        self.selenium.get('%s%s' % (self.live_server_url,

            reverse('article_form', args=[article.pk])))

        self.selenium.find_element_by_id('submit').submit()

        article = Article.objects.get(pk=article.pk)

        # Should be "\nTst\n" after #19251 is fixed

        self.assertEqual(article.content, "\r\nTst\r\n")





@python_2_unicode_compatible

class FakeFieldFile(object):

    """