diff options
| -rw-r--r-- | chimere/admin.py | 7 | ||||
| -rw-r--r-- | chimere/templates/admin/chimere/managed_modified.html (renamed from chimere/templates/admin/managed_modified.html) | 0 | ||||
| -rw-r--r-- | chimere/templates/admin/chimere/osm_export.html (renamed from chimere/templates/admin/osm_export.html) | 0 | ||||
| -rw-r--r-- | chimere/templates/admin/chimere/propertymodel/change_form.html | 7 | ||||
| -rw-r--r-- | example_project/settings.py | 4 |
5 files changed, 15 insertions, 3 deletions
diff --git a/chimere/admin.py b/chimere/admin.py index 931dcf1..87d2e08 100644 --- a/chimere/admin.py +++ b/chimere/admin.py @@ -150,7 +150,7 @@ def managed_modified(modeladmin, request, queryset): item.delete() messages.success(request, _(u"Modified item traited.")) return HttpResponseRedirect(request.get_full_path()) - return render_to_response('admin/managed_modified.html', + return render_to_response('admin/chimere/managed_modified.html', {'item':item, 'item_ref':item_ref}, context_instance=RequestContext(request)) managed_modified.short_description = _(u"Managed modified items") @@ -343,7 +343,7 @@ def export_to_osm(modeladmin, request, queryset): form = OSMForm() msg_item = _(u"%s point(s) of interest concerned by this export before "\ u"bounding box filter.") % item_nb - return render_to_response('admin/osm_export.html', {'item':importer, + return render_to_response('admin/chimere/osm_export.html', {'item':importer, 'form':form, 'msg_item':msg_item}, context_instance=RequestContext(request)) export_to_osm.short_description = _(u"Export to osm") @@ -393,7 +393,8 @@ admin.site.register(Category, CategoryAdmin) admin.site.register(Icon, IconAdmin) admin.site.register(Marker, MarkerAdmin) admin.site.register(Route, RouteAdmin) -admin.site.register(PropertyModel, PropertyModelAdmin) +if not settings.CHIMERE_HIDE_PROPERTYMODEL: + admin.site.register(PropertyModel, PropertyModelAdmin) admin.site.register(Area, AreaAdmin) admin.site.register(ColorTheme, ColorThemeAdmin) admin.site.register(Layer) diff --git a/chimere/templates/admin/managed_modified.html b/chimere/templates/admin/chimere/managed_modified.html index c55650d..c55650d 100644 --- a/chimere/templates/admin/managed_modified.html +++ b/chimere/templates/admin/chimere/managed_modified.html diff --git a/chimere/templates/admin/osm_export.html b/chimere/templates/admin/chimere/osm_export.html index dab123e..dab123e 100644 --- a/chimere/templates/admin/osm_export.html +++ b/chimere/templates/admin/chimere/osm_export.html diff --git a/chimere/templates/admin/chimere/propertymodel/change_form.html b/chimere/templates/admin/chimere/propertymodel/change_form.html new file mode 100644 index 0000000..0ebeab0 --- /dev/null +++ b/chimere/templates/admin/chimere/propertymodel/change_form.html @@ -0,0 +1,7 @@ +{% extends "admin/change_form.html" %} +{% load i18n %} +{% block after_field_sets %} +<p class='errornote'> +{% trans "After add/modification of property models you'll have to reload the webserver." %} +</p> +{% endblock %} diff --git a/example_project/settings.py b/example_project/settings.py index e6e0430..c48a847 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -69,6 +69,10 @@ CHIMERE_OSM_API_URL = 'api06.dev.openstreetmap.org' # test URL CHIMERE_OSM_USER = 'test' CHIMERE_OSM_PASSWORD = 'test' +# as the web server need to be reloaded when property models are changed +# it could be a good idea to hide it to an admin who could'nt do that +CHIMERE_HIDE_PROPERTYMODEL = False + # encoding for shapefile import CHIMERE_SHAPEFILE_ENCODING = 'ISO-8859-1' |