diff options
Diffstat (limited to 'chimere/admin.py')
| -rw-r--r-- | chimere/admin.py | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/chimere/admin.py b/chimere/admin.py index 6c7b2cc..c9107a5 100644 --- a/chimere/admin.py +++ b/chimere/admin.py @@ -37,15 +37,15 @@ except ImportError: pass from chimere.forms import MarkerAdminForm, RouteAdminForm, AreaAdminForm,\ - NewsAdminForm, CategoryAdminForm, ImporterAdminForm, \ - PictureFileAdminForm, MultimediaFileAdminForm, OSMForm + NewsAdminForm, CategoryAdminForm, ImporterAdminForm, OSMForm, \ + PageAdminForm, PictureFileAdminForm, MultimediaFileAdminForm from chimere.models import Category, Icon, SubCategory, Marker, \ PropertyModel, News, Route, Area, ColorTheme, Color, \ MultimediaFile, PictureFile, Importer, Layer, AreaLayers,\ + PropertyModelChoice, MultimediaExtension, Page,\ get_areas_for_user, get_users_by_area from chimere.utils import unicode_normalize, ShapefileManager, KMLManager,\ CSVManager -from chimere.widgets import TextareaWidget def disable(modeladmin, request, queryset): for item in queryset: @@ -186,9 +186,9 @@ class MarkerAdmin(admin.ModelAdmin): actions = [validate, disable, managed_modified, export_to_kml, export_to_shapefile, export_to_csv] exclude = ['submiter_session_key', 'import_key', 'import_version', - 'available_date'] + 'available_date', 'ref_item'] readonly_fields = ['submiter_email', 'submiter_comment', 'import_source', - 'ref_item', 'modified_since_import', 'route'] + 'submiter_name', 'ref_item', 'modified_since_import', 'route'] form = MarkerAdminForm fieldsets = ((None, { 'fields': ['point', 'name', 'status', 'categories', @@ -387,11 +387,17 @@ class ImporterAdmin(admin.ModelAdmin): form = ImporterAdminForm list_display = ('display_categories', 'default_name', 'importer_type', 'source', 'state', 'filtr') - list_filter = ('importer_type',) + list_filter = ('importer_type', 'categories') readonly_fields = ('state',) actions = [importing, cancel_import, export_to_osm, cancel_export] admin.site.register(Importer, ImporterAdmin) +class PageAdmin(admin.ModelAdmin): + """ + Use the TinyMCE widget for the page content + """ + form = PageAdminForm + class PropertyModelAdmin(admin.ModelAdmin): list_display = ('name', 'order', 'available') @@ -421,8 +427,16 @@ class ColorThemeAdmin(admin.ModelAdmin): class IconAdmin(admin.ModelAdmin): exclude = ['height', 'width'] + list_display = ['name'] + +class PropertyModelChoiceInline(admin.TabularInline): + model = PropertyModelChoice + extra = 1 +class PropertyModelAdmin(admin.ModelAdmin): + inlines = [PropertyModelChoiceInline] # register of differents database fields +admin.site.register(Page, PageAdmin) admin.site.register(News, NewsAdmin) admin.site.register(Category, CategoryAdmin) admin.site.register(Icon, IconAdmin) |