summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-08-04 19:40:50 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-08-04 19:40:50 +0200
commit9479761a848cbacc95257042bc0a3c3e9a72735e (patch)
tree23ee77dccdc432e6280eeb521211d23da9d593e4
parentce77d57ba181ad9e0b6096be24c106575359d49c (diff)
downloadChimère-9479761a848cbacc95257042bc0a3c3e9a72735e.tar.bz2
Chimère-9479761a848cbacc95257042bc0a3c3e9a72735e.zip
Admin: small improvment on admin form
-rw-r--r--chimere/admin.py5
-rw-r--r--chimere/forms.py10
2 files changed, 12 insertions, 3 deletions
diff --git a/chimere/admin.py b/chimere/admin.py
index b5697db..97403f0 100644
--- a/chimere/admin.py
+++ b/chimere/admin.py
@@ -35,7 +35,7 @@ except ImportError:
pass
from chimere.forms import MarkerAdminForm, RouteAdminForm, AreaAdminForm,\
- NewsAdminForm, CategoryAdminForm
+ NewsAdminForm, CategoryAdminForm, ImporterAdminForm
from chimere.models import Category, Icon, SubCategory, Marker, \
PropertyModel, News, Route, Area, ColorTheme, Color, RouteFile,\
MultimediaType, MultimediaFile, PictureFile, Importer, Layer, AreaLayers
@@ -193,8 +193,9 @@ def export_to_osm(modeladmin, request, queryset):
export_to_osm.short_description = _(u"Export to osm")
class ImporterAdmin(admin.ModelAdmin):
+ form = ImporterAdminForm
list_display = ('importer_type', 'source', 'state', 'filtr')
- list_filter = ('importer_type', 'source')
+ list_filter = ('importer_type',)
readonly_fields = ('state',)
actions = [importing, cancel_import, cancel_export]
admin.site.register(Importer, ImporterAdmin)
diff --git a/chimere/forms.py b/chimere/forms.py
index ad4895c..e3486c0 100644
--- a/chimere/forms.py
+++ b/chimere/forms.py
@@ -33,7 +33,7 @@ from django.core.mail import EmailMessage, BadHeaderError
from chimere.models import Marker, Route, PropertyModel, Property, Area,\
News, Category, SubCategory, RouteFile, MultimediaFile, MultimediaType, \
- PictureFile
+ PictureFile, Importer
from chimere.widgets import AreaField, PointField, TextareaWidget, \
DatePickerWidget
@@ -97,6 +97,14 @@ class NewsAdminForm(forms.ModelForm):
class Meta:
model = News
+class ImporterAdminForm(forms.ModelForm):
+ class Meta:
+ model = Importer
+ widgets = {
+ 'source': forms.TextInput(attrs={'size': 80}),
+ 'filtr': forms.TextInput(attrs={'size': 80}),
+ }
+
class CategoryAdminForm(forms.ModelForm):
"""
Main form for categories