diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-11-16 16:38:02 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-11-16 16:38:02 +0100 |
| commit | e4e3aec612c769becdf38ea2ff7e4e9b0e6dffc5 (patch) | |
| tree | 63612f25d3099cd0b415f4b3fc554fb0870baa44 | |
| parent | ab5a93714115d6559eee54a5eb5a7327fe66be48 (diff) | |
| download | Chimère-e4e3aec612c769becdf38ea2ff7e4e9b0e6dffc5.tar.bz2 Chimère-e4e3aec612c769becdf38ea2ff7e4e9b0e6dffc5.zip | |
Admin: fix area modifications (refs #411)
| -rw-r--r-- | chimere/admin.py | 2 | ||||
| -rw-r--r-- | chimere/forms.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chimere/admin.py b/chimere/admin.py index 8700c30..482c276 100644 --- a/chimere/admin.py +++ b/chimere/admin.py @@ -211,7 +211,7 @@ class AreaAdmin(admin.ModelAdmin): form = AreaAdminForm exclude = ['upper_left_corner', 'lower_right_corner'] inlines = [LayerInline] - list_display = ['name', 'order', 'default'] + list_display = ['name', 'order', 'available', 'default'] def importing(modeladmin, request, queryset): for importer in queryset: diff --git a/chimere/forms.py b/chimere/forms.py index 6ab44d3..4c26d52 100644 --- a/chimere/forms.py +++ b/chimere/forms.py @@ -472,9 +472,11 @@ class AreaAdminForm(forms.ModelForm): if not self.cleaned_data.get('upper_left_lat') \ and not self.cleaned_data.get('upper_left_lon') \ and not self.cleaned_data.get('lower_right_lat') \ - and not self.cleaned_data.get('lower_right_lon'): + and not self.cleaned_data.get('lower_right_lon') \ + and not self.cleaned_data.get('area'): msg = _(u"No area selected.") raise forms.ValidationError(msg) + return self.cleaned_data def save(self, *args, **keys): """ |