From 86e69bf3b67ff1e156413e07cef018ec52c2cdd4 Mon Sep 17 00:00:00 2001 From: Andrew Godwin Date: Fri, 17 Jan 2014 10:45:31 +0000 Subject: Fixed #21785: Bad handling of both auto_now and _add on deconstruct --- django/db/models/fields/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'django') diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index bc5c48da01..7172cf1a55 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -904,10 +904,9 @@ class DateField(Field): name, path, args, kwargs = super(DateField, self).deconstruct() if self.auto_now: kwargs['auto_now'] = True - del kwargs['editable'] - del kwargs['blank'] if self.auto_now_add: kwargs['auto_now_add'] = True + if self.auto_now or self.auto_now_add: del kwargs['editable'] del kwargs['blank'] return name, path, args, kwargs -- cgit v1.3