Merge branch 'master' into allow-http-id

2014-10-09 15:21:34 -07:00 · 2014-10-09 15:21:34 -07:00 · 73435e399c
parent 93c9b696b2 f4ccca4d65
commit 73435e399c
1 changed files with 1 additions and 1 deletions
--- a/frontend/forms.py
+++ b/frontend/forms.py
@ -516,7 +516,7 @@ def getManageCampaignForm ( instance, data=None, initial=None, *args, **kwargs )
            new_deadline= new_deadline_date + timedelta(hours=23,minutes=59)
            if self.instance:
                if self.instance.status == 'ACTIVE':
-                    return self.instance.deadline.date()
+                    return self.instance.deadline
            if new_deadline_date - now() > timedelta(days=int(settings.UNGLUEIT_LONGEST_DEADLINE)):
                raise forms.ValidationError(_('The chosen closing date is more than %s days from now' % settings.UNGLUEIT_LONGEST_DEADLINE))
            elif new_deadline - now() < timedelta(days=0):