diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-08-20 21:25:08 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-08-20 21:25:08 +0200 |
| commit | ce0340030c1b35e81903ab78024c5f7caa067af6 (patch) | |
| tree | 2db8c7fddba57f8492cd6aeedf0f675aa180adf8 /chimere/models.py | |
| parent | 7d739ad85f9b83b0a3692e1b184cb7047b5fb66b (diff) | |
| parent | 98f5da135ccfe9ede29f137f1470024ad296a7bf (diff) | |
| download | Chimère-ce0340030c1b35e81903ab78024c5f7caa067af6.tar.bz2 Chimère-ce0340030c1b35e81903ab78024c5f7caa067af6.zip | |
Merge branch 'master' into eds
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
chimere/templates/chimere/edit.html
Diffstat (limited to 'chimere/models.py')
| -rw-r--r-- | chimere/models.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chimere/models.py b/chimere/models.py index f4c7311..ca608e8 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -234,9 +234,11 @@ class GeographicItem(models.Model): categories = SelectMultipleField(SubCategory) submiter_session_key = models.CharField(_(u"Submitter session key"), blank=True, null=True, max_length=40) + submiter_name = models.CharField(_(u"Submitter name or nickname"), + blank=True, null=True, max_length=40) submiter_email = models.EmailField(_(u"Submitter email"), blank=True, null=True) - submiter_comment = models.CharField(_(u"Submitter comment"), max_length=200, + submiter_comment = models.TextField(_(u"Submitter comment"), max_length=200, blank=True, null=True) STATUS = (('S', _(u'Submited')), ('A', _(u'Available')), |