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/views.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/views.py')
| -rw-r--r-- | chimere/views.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chimere/views.py b/chimere/views.py index 59fc3b8..d33f5a9 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -167,9 +167,11 @@ def get_edit_page(redirect_url, item_cls, item_form): notifySubmission(item) response_dct = get_base_response(area_name) return redirect(redirect_url + '-item', - area_name if area_name else '', item.ref_item.pk, - 'submited'),\ - None + area_name if area_name else '', + item.ref_item.pk, 'submited'), None + else: + response_dct['error_message'] = _(u"There are missing field(s)" + u" and/or errors in the submited form.") else: form = item_form(instance=init_item) formset_multi = MultimediaFileFormSet(initial=init_multi, @@ -197,7 +199,6 @@ def edit(request, area_name="", item_id=None, submited=False): response_dct.update({ 'actions':actions, 'action_selected':('contribute', 'edit'), - 'error_message':'', 'map_layer':settings.CHIMERE_MAP_LAYER, 'form':form, 'formset_multi':formset_multi, |