Unverified Commit 20b6042b authored by Thom Wiggers's avatar Thom Wiggers 📐
Browse files

Fix bugs, demo features

parent 4af6cbac
# -*- coding: utf-8 -*-
# Generated by Django 1.10b1 on 2016-07-06 17:32
from __future__ import unicode_literals
import django.core.validators
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('members', '0001_squashed_0004_auto_20160706_1532'),
]
operations = [
migrations.AlterField(
model_name='member',
name='emergency_contact_phone_number',
field=models.CharField(blank=True, help_text='The phone number for the emergency contact', max_length=20, null=True, validators=[django.core.validators.RegexValidator(message='Voer een geldig telefoonnummer in.', regex='^\\+?\\d+$')], verbose_name='Emergency contact phone number'),
),
migrations.AlterField(
model_name='member',
name='phone_number',
field=models.CharField(blank=True, help_text='Enter a phone number so Thalia may reach you', max_length=20, null=True, validators=[django.core.validators.RegexValidator(message='Please enter a valid phone number', regex='^\\+?\\d+$')], verbose_name='Phone number'),
),
]
......@@ -96,7 +96,7 @@ class Member(models.Model):
)
phone_number = models.CharField(
max_length=13,
max_length=20,
verbose_name=_('Phone number'),
help_text=_('Enter a phone number so Thalia may reach you'),
validators=[validators.RegexValidator(
......@@ -118,7 +118,7 @@ class Member(models.Model):
)
emergency_contact_phone_number = models.CharField(
max_length=13,
max_length=20,
verbose_name=_('Emergency contact phone number'),
help_text=_('The phone number for the emergency contact'),
validators=[validators.RegexValidator(
......@@ -218,7 +218,7 @@ class Member(models.Model):
Tested by checking if the expiration date has passed.
"""
return self.membership_expiration < datetime.utcnow()
return self.membership_expiration > datetime.utcnow()
# Special properties for admin site
is_active.boolean = True
is_active.short_description = _('Is this user currently active')
......
{% extends "base.html" %}
{% block title %}Hello World{% endblock %}
{% block title %}Hello World - {{ block.super }}{% endblock %}
{% block body %}
<h1>Hello world</h1>
......@@ -9,7 +9,7 @@
<ul>
{% for member in members %}
<li>{{ member }} - {{ member.type }}</li>
{% else %}
{% empty %}
<li>Er zijn geen leden</li>
{% endfor %}
</ul>
......
......@@ -4,10 +4,12 @@
<head>
<title>{% block title %}{% endblock %}</title>
{% block js_head %}{% endblock %}
{% block css %}{% endblock %}
{% block css %}
<link rel="stylesheet" href="{% static 'style.css' %}" type="text/css" />
{% endblock %}
</head>
<body>
{% block body %}{% endblock %}
{% block js %} {% endblock %}
{% block js %}{% endblock %}
</body>
</html>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment