diff --git a/members/migrations/0006_auto_20161210_1723.py b/members/migrations/0006_auto_20161210_1723.py new file mode 100644 index 0000000..1c92b38 --- /dev/null +++ b/members/migrations/0006_auto_20161210_1723.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2016-12-10 17:23 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('members', '0005_member_paid'), + ] + + operations = [ + migrations.AlterField( + model_name='member', + name='paid', + field=models.DateTimeField(default=datetime.datetime(1970, 1, 1, 0, 0)), + ), + ] diff --git a/members/models.py b/members/models.py index 220cfbc..bb23085 100644 --- a/members/models.py +++ b/members/models.py @@ -16,7 +16,7 @@ class Member(models.Model): AYY = models.BooleanField(default=False) jas = models.BooleanField(default=False) created = models.DateTimeField(default=timezone.now) - paid = models.DateTimeField(default=None,null=True,blank=True) + paid = models.DateTimeField(default=datetime.fromtimestamp(0)) def get_dict(self): return { @@ -92,8 +92,11 @@ class MemberRequest(models.Model): } def date2str(date): - if not date: - return 'Ei koskaan' + ''' + Convert date to a standard date string + ''' + if date is None: + return None return date.strftime("%Y-%m-%d %H:%M:%S") def str2date(s):