Django

Code

Show
Ignore:
Timestamp:
07/19/08 08:30:47 (4 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7921,7926-7928,7938-7941,7945-7947,7949-7950,7952,7955-7956,7961,7964-7968,7970-7978 via svnmerge from trunk.

This includes the newforms-admin branch, and thus is backwards-incompatible. The geographic admin is _not_ in this changeset, and is forthcoming.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7917 to /django/trunk:1-7978

  • django/branches/gis/django/contrib/flatpages/models.py

    r7836 r7979  
    2121        verbose_name_plural = _('flat pages') 
    2222        ordering = ('url',) 
    23  
    24     class Admin: 
    25         fields = ( 
    26             (None, {'fields': ('url', 'title', 'content', 'sites')}), 
    27             (_('Advanced options'), {'classes': 'collapse', 'fields': ('enable_comments', 'registration_required', 'template_name')}), 
    28         ) 
    29         list_display = ('url', 'title') 
    30         list_filter = ('sites', 'enable_comments', 'registration_required') 
    31         search_fields = ('url', 'title') 
    32  
     23     
    3324    def __unicode__(self): 
    3425        return u"%s -- %s" % (self.url, self.title)