summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-08-29 03:04:04 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-08-29 03:04:04 +0200
commitb033d05ed1464a6f2fd1aca7e98a00d87970ed5d (patch)
tree35fe533feed02b71348f097a86e1c2c6d2343fcc
parentea133f3a5b5b3cba2bef5a1bc2142ab0f7b23fda (diff)
downloadChimère-b033d05ed1464a6f2fd1aca7e98a00d87970ed5d.tar.bz2
Chimère-b033d05ed1464a6f2fd1aca7e98a00d87970ed5d.zip
Clean initial_data and fix a non necessary requirement in Area form
-rw-r--r--chimere/fixtures/initial_data.json33
-rw-r--r--chimere/forms.py2
2 files changed, 1 insertions, 34 deletions
diff --git a/chimere/fixtures/initial_data.json b/chimere/fixtures/initial_data.json
index fe1cc98..4a987db 100644
--- a/chimere/fixtures/initial_data.json
+++ b/chimere/fixtures/initial_data.json
@@ -34,39 +34,6 @@
}
},
{
- "pk": 1,
- "model": "chimere.category",
- "fields": {
- "available": true,
- "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc blandit porta eros, quis varius orci luctus nec. Suspendisse tempor sagittis tortor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Vivamus imperdiet consequat dolor. Etiam risus orci, auctor nec hendrerit ut, congue at ante. Aliquam et accumsan neque. Aliquam ac massa felis, ac porttitor nunc. Curabitur blandit odio id enim sodales blandit. Curabitur eleifend commodo lorem a feugiat. Nam at quam semper justo ultricies tempor.\r\n",
- "name": "Default category",
- "order": 10
- }
- },
- {
- "pk": 1,
- "model": "chimere.icon",
- "fields": {
- "width": 21,
- "image": "icons/marker.png",
- "name": "Default icon",
- "height": 25
- }
- },
- {
- "pk": 1,
- "model": "chimere.subcategory",
- "fields": {
- "category": 1,
- "available": true,
- "name": "Default subcategory",
- "item_type": "M",
- "color_theme": null,
- "order": 10,
- "icon": 1
- }
- },
- {
"pk": 7,
"model": "chimere.multimediatype",
"fields": {
diff --git a/chimere/forms.py b/chimere/forms.py
index d1ddceb..985e2ca 100644
--- a/chimere/forms.py
+++ b/chimere/forms.py
@@ -424,7 +424,7 @@ class AreaAdminForm(forms.ModelForm):
Admin page to create an area
"""
area = AreaField(label=_("Area"), fields=(PointField(), PointField()))
- welcome_message = forms.CharField(widget=TextareaWidget)
+ welcome_message = forms.CharField(widget=TextareaWidget, required=False)
class Meta:
model = Area