From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Fri, 16 Jan 2009 21:27:55 +0000 (+0100)
Subject: Merge branch 'production'
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=31b568b8f923b0d146c6090527f0c41fa4b6c7b9;p=matthijs%2Fprojects%2Fxerxes.git

Merge branch 'production'

* production:
  Allow Influence.todo to be blank.
---

31b568b8f923b0d146c6090527f0c41fa4b6c7b9
diff --cc influences/models.py
index 2c62626,6464e68..8f243f5
--- a/influences/models.py
+++ b/influences/models.py
@@@ -46,12 -38,11 +46,12 @@@ class Influence(models.Model)
      created     = models.DateField(auto_now_add=1, verbose_name = _("Creation time"))
      modified    = models.DateField(auto_now=1, verbose_name = _("Modification time"))
      
 -    character   = models.ForeignKey(Character, verbose_name = _("Character"))
 -    contact     = models.CharField(max_length=255, verbose_name = _("Contact Name"))
 +    initiator   = models.ForeignKey(Character, verbose_name = _("Initiator"), related_name='initiated_influences')
 +    other_contacts = models.CharField(max_length=255, blank = True, verbose_name = _("Other Contacts"))
 +    other_characters = models.ManyToManyField(Character, blank = True, verbose_name = _("Involved characters"), related_name='influences_involved_in')
      summary     = models.CharField(max_length=255, verbose_name = _("Summary"))
      description = models.TextField(verbose_name = _("Description"))
-     todo        = models.TextField(verbose_name = _("Todo"))
+     todo        = models.TextField(blank=True, verbose_name = _("Todo"))
      status      = models.CharField(max_length=1, choices=STATUS_CHOICES, default='N', verbose_name = _("Status"))
      longterm    = models.BooleanField(default=False, verbose_name = _("Long term"))