website Files · www/conservancy/apps/staff/models.py

Files @ f1575ece1a6b

Branch filter:

Location: website/www/conservancy/apps/staff/models.py

f1575ece1a6b 933 B text/x-python Show Annotation Show as Raw Download as Raw

bkuhn

Merge in various HTML fixes from Martin Michlmayr <tbm@cyrius.com> on 2013-02-21.

This did not fast-forward merge because I'd made changes to those files since
Martin submitted his merge request. This merge brings in the changes
contributed in the following two commits from Martin:

commit 8b54927bb51833156a75354090c6ff7dd8794bc8
Author: Martin Michlmayr <tbm@cyrius.com>
Date: 2013-02-21 21:47:15 +0000

Remove stray character

commit 660c48a528baf4e09bb7cc3ccd30afd7bf46072d
Author: Martin Michlmayr <tbm@cyrius.com>
Date: 2013-02-21 21:46:40 +0000

Fix various HTML syntax errors

from django.db import models

class Person(models.Model):
    """Staff members

    Referenced from other models (blog, events, etc)
    """

    username = models.CharField(max_length=20)
    formal_name = models.CharField(max_length=200)
    casual_name = models.CharField(max_length=200)
#    title = models.CharField(max_length=200, blank=True)
#    biography = models.TextField(blank=True)
#    phone = models.CharField(max_length=30, blank=True)
#    gpg_key = models.TextField(blank=True)
#    gpg_fingerprint = models.CharField(max_length=100, blank=True)
    currently_employed = models.BooleanField(default=True)

    date_created = models.DateTimeField(auto_now_add=True)
    date_last_modified = models.DateTimeField(auto_now=True)

    class Meta:
        verbose_name_plural = 'people'

    def __unicode__(self):
        return self.username

    def biography_url(self):
        return u"/about/#%s" % self.username