X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/6656eefd4a3bbea3f77d82849f8b512b79cb324c..bae6b1cbc5eb00d2273c45b55ea0950949fce0a9:/contrib/penfield/models.py diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py index f014a1d..8d6de3c 100644 --- a/contrib/penfield/models.py +++ b/contrib/penfield/models.py @@ -1,38 +1,19 @@ from django.db import models -from philo.models import Entity, MultiView, Template, register_value_model -from django.contrib.auth.models import User +from django.conf import settings +from philo.models import Tag, Titled, Entity, MultiView, Template, register_value_model from django.conf.urls.defaults import url, patterns from django.http import Http404, HttpResponse from django.template import RequestContext from datetime import datetime -class Tag(models.Model): - name = models.CharField(max_length=250) - slug = models.SlugField() - - def __unicode__(self): - return self.name - - -class Titled(models.Model): - title = models.CharField(max_length=255) - slug = models.SlugField() - - def __unicode__(self): - return self.title - - class Meta: - abstract = True - - class Blog(Entity, Titled): pass class BlogEntry(Entity, Titled): blog = models.ForeignKey(Blog, related_name='entries') - author = models.ForeignKey(User, related_name='blogentries') + author = models.ForeignKey(getattr(settings, 'PHILO_PERSON_MODULE', 'auth.User'), related_name='blogentries') date = models.DateTimeField(default=datetime.now) content = models.TextField() excerpt = models.TextField() @@ -139,12 +120,12 @@ class Newsletter(Entity, Titled): pass -class NewsStory(Entity, Titled): +class NewsletterArticle(Entity, Titled): newsletter = models.ForeignKey(Newsletter, related_name='stories') - authors = models.ManyToManyField(User, related_name='newsstories') + authors = models.ManyToManyField(getattr(settings, 'PHILO_PERSON_MODULE', 'auth.User'), related_name='newsstories') date = models.DateTimeField(default=datetime.now) lede = models.TextField(null=True, blank=True) full_text = models.TextField() -register_value_model(NewsStory) \ No newline at end of file +register_value_model(NewsletterArticle) \ No newline at end of file