diff options
| -rw-r--r-- | chimere/admin.py | 5 | ||||
| -rw-r--r-- | chimere/forms.py | 14 |
2 files changed, 11 insertions, 8 deletions
diff --git a/chimere/admin.py b/chimere/admin.py index 399e6e1..8700c30 100644 --- a/chimere/admin.py +++ b/chimere/admin.py @@ -211,6 +211,7 @@ class AreaAdmin(admin.ModelAdmin): form = AreaAdminForm exclude = ['upper_left_corner', 'lower_right_corner'] inlines = [LayerInline] + list_display = ['name', 'order', 'default'] def importing(modeladmin, request, queryset): for importer in queryset: @@ -248,6 +249,8 @@ class ImporterAdmin(admin.ModelAdmin): actions = [importing, cancel_import, export_to_osm, cancel_export] admin.site.register(Importer, ImporterAdmin) +class PropertyModelAdmin(admin.ModelAdmin): + list_display = ('name', 'order', 'available') class NewsAdmin(admin.ModelAdmin): """ @@ -282,7 +285,7 @@ admin.site.register(Category, CategoryAdmin) admin.site.register(Icon, IconAdmin) admin.site.register(Marker, MarkerAdmin) admin.site.register(Route, RouteAdmin) -admin.site.register(PropertyModel) +admin.site.register(PropertyModel, PropertyModelAdmin) admin.site.register(Area, AreaAdmin) admin.site.register(ColorTheme, ColorThemeAdmin) admin.site.register(Layer) diff --git a/chimere/forms.py b/chimere/forms.py index 4b4d49f..6ab44d3 100644 --- a/chimere/forms.py +++ b/chimere/forms.py @@ -110,17 +110,17 @@ class ImporterAdminForm(forms.ModelForm): Verify that only one type of source is provided Verify that shapefiles are zipped ''' - if self.cleaned_data['importer_type'] == 'SHP' and \ - not self.cleaned_data['zipped']: + if self.cleaned_data.get('importer_type') == 'SHP' and \ + not self.cleaned_data.get('zipped'): raise forms.ValidationError(_(u"Shapefiles must be provided in a "\ u"zipped archive.")) - if self.cleaned_data['source'] and \ - self.cleaned_data['source_file']: + if self.cleaned_data.get('source') and \ + self.cleaned_data.get('source_file'): raise forms.ValidationError(_(u"You have to set \"source\" or " u"\"source file\" but not both.")) - if not self.cleaned_data['source'] and \ - not self.cleaned_data['source_file'] and \ - self.cleaned_data['importer_type'] != 'OSM': + if not self.cleaned_data.get('source') and \ + not self.cleaned_data.get('source_file') and \ + self.cleaned_data.get('importer_type') != 'OSM': raise forms.ValidationError(_(u"You have to set \"source\" or " u"\"source file\".")) return self.cleaned_data |