Django

Code

Changeset 8292

Show
Ignore:
Timestamp:
08/10/08 23:28:33 (4 months ago)
Author:
gwilson
Message:

Refs #7742 -- newforms-admin does not use oldforms validator_list argument, made a custom FlatPageForm to check the entered URL.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/flatpages/admin.py

    r7967 r8292  
     1from django import forms 
    12from django.contrib import admin 
    23from django.contrib.flatpages.models import FlatPage 
    …… 
    45 
    56 
     7class FlatpageForm(forms.ModelForm): 
     8    url = forms.RegexField(label=_("URL"), max_length=100, regex=r'^[-\w/]+$', 
     9        help_text = _("Example: '/about/contact/'. Make sure to have leading" 
     10                      " and trailing slashes."), 
     11        error_message = _("This value must contain only letters, numbers," 
     12                          " underscores, dashes or slashes.")) 
     13 
     14    class Meta: 
     15        model = FlatPage 
     16 
     17 
    618class FlatPageAdmin(admin.ModelAdmin): 
     19    form = FlatpageForm 
    720    fieldsets = ( 
    821        (None, {'fields': ('url', 'title', 'content', 'sites')}), 

  • django/trunk/django/contrib/flatpages/models.py

    r7967 r8292  
    66 
    77class FlatPage(models.Model): 
    8     url = models.CharField(_('URL'), max_length=100, validator_list=[validators.isAlphaNumericURL], db_index=True, 
    9         help_text=_("Example: '/about/contact/'. Make sure to have leading and trailing slashes.")) 
     8    url = models.CharField(_('URL'), max_length=100, db_index=True) 
    109    title = models.CharField(_('title'), max_length=200) 
    1110    content = models.TextField(_('content'), blank=True) 
    …… 
    2120        verbose_name_plural = _('flat pages') 
    2221        ordering = ('url',) 
    23      
     22 
    2423    def __unicode__(self): 
    2524        return u"%s -- %s" % (self.url, self.title)