Refs #4960 -- Fixed selenium test failures for CharField strip changes.

This commit is contained in:
Tim Graham 2015-07-04 13:24:28 -04:00
parent 8556978078
commit e7c6a2cf9f
2 changed files with 13 additions and 1 deletions

View File

@ -15,6 +15,7 @@ from django.contrib.auth.models import Group, User
from django.core.exceptions import ValidationError
from django.core.files.storage import FileSystemStorage
from django.core.mail import EmailMessage
from django.db import models
from django.forms.models import BaseModelFormSet
from django.http import HttpResponse, StreamingHttpResponse
from django.utils.safestring import mark_safe
@ -654,6 +655,7 @@ class RelatedPrepopulatedInline1(admin.StackedInline):
'fields': (('pubdate', 'status'), ('name', 'slug1', 'slug2',),)
}),
)
formfield_overrides = {models.CharField: {'strip': False}}
model = RelatedPrepopulated
extra = 1
prepopulated_fields = {'slug1': ['name', 'pubdate'],
@ -674,6 +676,7 @@ class MainPrepopulatedAdmin(admin.ModelAdmin):
'fields': (('pubdate', 'status'), ('name', 'slug1', 'slug2',),)
}),
)
formfield_overrides = {models.CharField: {'strip': False}}
prepopulated_fields = {'slug1': ['name', 'pubdate'],
'slug2': ['status', 'name']}

View File

@ -1,9 +1,18 @@
from django import forms
from django.views.generic.edit import UpdateView
from .models import Article
class ArticleForm(forms.ModelForm):
content = forms.CharField(strip=False, widget=forms.Textarea)
class Meta:
model = Article
fields = '__all__'
class ArticleFormView(UpdateView):
model = Article
success_url = '/'
fields = '__all__'
form_class = ArticleForm