projects
/
matthijs
/
projects
/
xerxes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Instantiate the new comment form class.
[matthijs/projects/xerxes.git]
/
influences
/
models.py
diff --git
a/influences/models.py
b/influences/models.py
index aefa83c802b882bda63d09b0234c771450bbc35c..1079b0a62b3518cf22992e8317c31a6204b15360 100644
(file)
--- a/
influences/models.py
+++ b/
influences/models.py
@@
-4,17
+4,19
@@
from django.utils.translation import ugettext_lazy as _
# Create your models here.
class Character(models.Model):
# Create your models here.
class Character(models.Model):
+ STATUS_CHOICES = (
+ ('N', _('New')),
+ ('A', _('Approved')),
+ )
created = models.DateField(auto_now_add=1, verbose_name = _("Creation time"))
modified = models.DateField(auto_now=1, verbose_name = _("Modification time"))
name = models.CharField(max_length=255, verbose_name = _("Name"))
created = models.DateField(auto_now_add=1, verbose_name = _("Creation time"))
modified = models.DateField(auto_now=1, verbose_name = _("Modification time"))
name = models.CharField(max_length=255, verbose_name = _("Name"))
+ status = models.CharField(max_length=2, choices=STATUS_CHOICES, default='N', verbose_name = _("Status"))
player = models.ForeignKey(User, verbose_name = _("Player"))
def __str__(self):
return self.name
player = models.ForeignKey(User, verbose_name = _("Player"))
def __str__(self):
return self.name
- class Admin:
- pass
-
class Meta:
verbose_name = _("Character")
verbose_name_plural = _("Characters")
class Meta:
verbose_name = _("Character")
verbose_name_plural = _("Characters")
@@
-30,7
+32,7
@@
class Influence(models.Model):
modified = models.DateField(auto_now=1, verbose_name = _("Modification time"))
character = models.ForeignKey(Character, verbose_name = _("Character"))
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"))
+ contact = models.CharField(max_length=255, verbose_name = _("Contact
Name
"))
summary = models.CharField(max_length=255, verbose_name = _("Summary"))
description = models.TextField(verbose_name = _("Description"))
status = models.TextField(max_length=1, choices=STATUS_CHOICES, default='N', verbose_name = _("Status"))
summary = models.CharField(max_length=255, verbose_name = _("Summary"))
description = models.TextField(verbose_name = _("Description"))
status = models.TextField(max_length=1, choices=STATUS_CHOICES, default='N', verbose_name = _("Status"))
@@
-41,12
+43,8
@@
class Influence(models.Model):
def __str__(self):
return self.summary
def __str__(self):
return self.summary
- class Admin:
- list_filter=('character', 'status', 'longterm')
- search_fields=('character', 'description', 'contact')
- list_display=('character', 'contact', 'summary', 'longterm', 'status')
-
class Meta:
verbose_name = _("Influence")
verbose_name_plural = _("Influences")
class Meta:
verbose_name = _("Influence")
verbose_name_plural = _("Influences")
+# vim: set sts=4 sw=4 expandtab: