Django

Code

Show
Ignore:
Timestamp:
07/19/08 08:30:47 (6 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/databrowse/plugins/calendars.py

    r7176 r7979  
    99from django.utils.safestring import mark_safe 
    1010from django.views.generic import date_based 
     11from django.utils import datetime_safe 
    1112 
    1213class CalendarPlugin(DatabrowsePlugin): 
    …… 
    3435    def urls(self, plugin_name, easy_instance_field): 
    3536        if isinstance(easy_instance_field.field, models.DateField): 
     37            d = easy_instance_field.raw_value 
    3638            return [mark_safe(u'%s%s/%s/%s/%s/%s/' % ( 
    3739                easy_instance_field.model.url(), 
    3840                plugin_name, easy_instance_field.field.name, 
    39                 easy_instance_field.raw_value.year, 
    40                 easy_instance_field.raw_value.strftime('%b').lower(), 
    41                 easy_instance_field.raw_value.day))] 
     41                d.year, 
     42                datetime_safe.new_date(d).strftime('%b').lower(), 
     43                d.day))] 
    4244 
    4345    def model_view(self, request, model_databrowse, url):