modelica/modelica.db @@ -2,8 +2,8 @@ from modelica.newsletter.models import Newsletter, Item, Section from django.contrib import admin class ItemAdmin(admin.ModelAdmin): - list_display = ('title', 'author', 'weight') - search_fields = ('title', 'author', 'organization', 'body') + list_display = ('title', 'weight') + search_fields = ('title', 'organization', 'body') list_filter = ('section',) ordering = ('weight',) modelica/newsletter/admin.py @@ -6,10 +6,8 @@ class Newsletter(models.Model): number = models.IntegerField() footer = models.XMLField(null=True,blank=True) - author = models.CharField(max_length=200,blank=True) - author_email = models.EmailField(blank=True) - # author = models.ForeignKey('auth.User', verbose_name="Newsletter Author", - # blank=True) + author = models.ForeignKey('auth.User', verbose_name="Newsletter Author", + blank=True) title = models.CharField(max_length=100,blank=True) body = models.XMLField(blank=True) @@ -25,10 +23,8 @@ class Section(models.Model): # Create your models here. class Item(models.Model): - author = models.CharField(max_length=200) - author_email = models.EmailField(blank=True) - # author = models.ForeignKey('auth.User', verbose_name="Item Author", - # blank=True) + author = models.ForeignKey('auth.User', verbose_name="Item Author", + blank=True) image = models.ImageField(upload_to="images",blank=True) organization = models.CharField(max_length=200) org_url = models.URLField(blank=True) @@ -37,4 +33,4 @@ class Item(models.Model): section = models.ForeignKey(Section) weight = models.IntegerField() def __unicode__(self): - return "%s: '%s' %s" % (self.author, unicode(self.title), unicode(self.section)) + return "%s: '%s' %s" % ('author', unicode(self.title), unicode(self.section)) modelica/newsletter/models.py @@ -113,7 +113,7 @@ Hilding Elmqvist, Treasurer (Dynasim AB, Sweden) {{item.body|safe}} <p><i> - This article is provided by {{item.author}} ({{item.organization}}). + This article is provided by {{item.author.first_name}} {{item.author.last_name}} ({{item.organization}}). </i></p> <div style="clear:both;"></div> </div> modelica/newsletter/templates/render.html 5fd5ff891b76786e2aa0ff34aacf950c0ae1a004 Michael Tiller mtiller@Emmeskay060.(none) http://github.com/mtiller/modelica-newsletter/commit/8542e9d513b124bf565ba52da05aa5eb3951449d 8542e9d513b124bf565ba52da05aa5eb3951449d 2009-11-06T11:28:15-08:00 2009-11-06T11:28:15-08:00 Added migrations to set authors up as users (and to render their names correctly in the HTML output). This is an important step in getting user accessibility. 5ad9185c15579c3b0b7ce23f78b695b18f4b6489 Michael Tiller mtiller@Emmeskay060.(none)