diff options
| author | Brian Rosner <brosner@gmail.com> | 2008-02-29 06:25:04 +0000 |
|---|---|---|
| committer | Brian Rosner <brosner@gmail.com> | 2008-02-29 06:25:04 +0000 |
| commit | ea78533a288ecb2174ba83dff7654f06793dd8b9 (patch) | |
| tree | ae8e6840b295600e9f95d071e33fc002fac83177 | |
| parent | 3d61eb4dae02998eed6a2d9194906959a0b91bec (diff) | |
newforms-admin: Fixed #5547. SplitDateTimeField now honors the default value from the model.
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/options.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index c3289ea27d..3778995d7b 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -152,9 +152,9 @@ class BaseModelAdmin(object): # For DateTimeFields, use a special field and widget. if isinstance(db_field, models.DateTimeField): - return forms.SplitDateTimeField(required=not db_field.blank, - widget=widgets.AdminSplitDateTime(), label=capfirst(db_field.verbose_name), - help_text=db_field.help_text, **kwargs) + kwargs['form_class'] = forms.SplitDateTimeField + kwargs['widget'] = widgets.AdminSplitDateTime() + return db_field.formfield(**kwargs) # For DateFields, add a custom CSS class. if isinstance(db_field, models.DateField): |