diff options
author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-04-07 02:01:56 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-04-07 02:01:56 +0200 |
commit | 177517832e1e67a97c44cc0a7d79cb79f5e77e03 (patch) | |
tree | 9d0474ef51da9b898b6288ba3d34fb7ed1088cb1 /chimere/models.py | |
parent | 73eb6055d36fd785c468ed0866df43fd4c3fef44 (diff) | |
download | Chimère-177517832e1e67a97c44cc0a7d79cb79f5e77e03.tar.bz2 Chimère-177517832e1e67a97c44cc0a7d79cb79f5e77e03.zip |
Fixes model type and form validation in edition panel.
* check URL format for multimedia items (closes #333)
* file field is required for pictures (closes #332)
* multimedia type is required for multimedia items (closes #331)
* name is required for pictures and multimedia items (closes #330)
* errors messages are now more visible (closes #328)
Diffstat (limited to 'chimere/models.py')
-rw-r--r-- | chimere/models.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chimere/models.py b/chimere/models.py index 3556e52..02eee76 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -463,8 +463,8 @@ IFRAME_LINKS = { } class MultimediaFile(models.Model): - name = models.CharField(_(u"Name"), max_length=150, blank=True, null=True) - url = models.CharField(_(u"Url"), max_length=200) + name = models.CharField(_(u"Name"), max_length=150) + url = models.URLField(_(u"Url"), max_length=200) order = models.IntegerField(_(u"Order"), default=1) multimedia_type = models.ForeignKey(MultimediaType) @@ -486,7 +486,7 @@ class MultimediaFile(models.Model): super(MultimediaFile, self).save(*args, **kwargs) class PictureFile(models.Model): - name = models.CharField(_(u"Name"), max_length=150, blank=True, null=True) + name = models.CharField(_(u"Name"), max_length=150) picture = models.ImageField(_(u"Image"), upload_to='pictures', height_field='height', width_field='width') height = models.IntegerField(_(u"Height")) |