From 8ac3f9172ad9caad17857ad89f1986b335e22d3d Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 4 Mar 2017 17:47:41 +0100 Subject: Admin: fix merge form for polygons and routes --- chimere/admin.py | 15 +++-- .../templates/admin/chimere/managed_modified.html | 72 ++++++++++++---------- .../admin/chimere/marker/change_form.html | 8 +-- .../templates/admin/chimere/route/change_form.html | 15 ++++- chimere/templatetags/chimere_tags.py | 2 + 5 files changed, 69 insertions(+), 43 deletions(-) mode change 120000 => 100644 chimere/templates/admin/chimere/route/change_form.html (limited to 'chimere') diff --git a/chimere/admin.py b/chimere/admin.py index 333db6d..03ed60d 100644 --- a/chimere/admin.py +++ b/chimere/admin.py @@ -107,7 +107,7 @@ export_to_csv.short_description = _("Export to CSV") def managed_modified(modeladmin, request, queryset): # not very clean... There is must be a better way to do that - redirect_url = request.get_full_path().split('admin_modification')[0] + redirect_url = request.get_full_path().split('admin-')[0] if queryset.count() != 1 and len(set([i.ref_item or i for i in queryset.all()])) != 1: messages.error(request, _("Only one item can be managed at a " @@ -311,7 +311,6 @@ POLYGON_FIELDSETS = deepcopy(MARKER_FIELDSETS) POLYGON_FIELDSETS[0][1]['fields'][0] = 'polygon' POLYGON_FIELDSETS[0][1]['fields'].pop(POLYGON_FIELDSETS[0][1]['fields'].index( 'description')) -POLYGON_FIELDSETS.pop(3) class MarkerAdmin(admin.ModelAdmin): @@ -371,11 +370,12 @@ class MarkerAdmin(admin.ModelAdmin): def get_urls(self): from django.conf.urls import patterns, url urls = super(MarkerAdmin, self).get_urls() + model_name = self.model.__name__.lower() my_urls = patterns( '', - url(r'^admin_modification/(?P\d+)/$', + url(r'^admin-{}-modification/(?P\d+)/$'.format(model_name), self.admin_site.admin_view(self.admin_modification), - name='admin-modification'), + name='admin-{}-modification'.format(model_name)), ) return my_urls + urls @@ -464,6 +464,13 @@ class PolygonAdmin(MarkerAdmin): fieldsets = POLYGON_FIELDSETS geo_type = 'polygon' + def admin_modification(self, request, item_id): + """ + Redirect to the polygon modification form + """ + return managed_modified(self, request, + models.Polygon.objects.filter(pk=item_id)) + class LayerInline(admin.TabularInline): model = AreaLayers diff --git a/chimere/templates/admin/chimere/managed_modified.html b/chimere/templates/admin/chimere/managed_modified.html index 6933abb..ebfe660 100644 --- a/chimere/templates/admin/chimere/managed_modified.html +++ b/chimere/templates/admin/chimere/managed_modified.html @@ -2,46 +2,50 @@ {% load chimere_tags i18n admin_static %} {% block extrahead %} - + {% endblock %} {% block content %}

{% trans "Be careful: after validation, the modified item will be deleted. There is no roll-back." %}

-
-{% csrf_token %} - - - - - - - - - - - - - - - - - -{% for property_ref in item_ref.getProperties %} -{% for property in item.getProperties %} -{% ifequal property_ref.propertymodel property.propertymodel %} - -{% endifequal %} -{% endfor %} -{% endfor %} - -
 {% trans "Reference" %}{% trans "Modified item" %}{% trans "Accept modification" %}
{% trans "Name" %}{{item_ref}}{{item}}
{% trans "Categories" %}{% for cat in item_ref.categories.all %}{%if forloop.counter0 %}, {%endif%}{{cat}}{%endfor%}{% for cat in item.categories.all %}{%if forloop.counter0 %}, {%endif%}{{cat}}{%endfor%}
{% trans "Emplacement" %}{{item_ref|ol_map:'map_ref_id'}}{{item|ol_map:'map_id'}}
{% trans "Description" %}{{item_ref.description|safe}}{{item.description|safe}}
{{property.propertymodel.name}}{{property_ref.value|safe}}{{property.value|safe}}
-
-
-

{% trans "Back to list" %}

- -
+ {% csrf_token %} +
+ + + + + + + + + + + + + + + + + + {% for property_ref in item_ref.getProperties %} + {% for property in item.getProperties %} + {% ifequal property_ref.propertymodel property.propertymodel %} + + {% endifequal %} + {% endfor %} + {% endfor %} + +
 {% trans "Reference" %}{% trans "Modified item" %}{% trans "Accept modification" %}
{% trans "Name" %}{{item_ref}}{{item}}
{% trans "Categories" %}{% for cat in item_ref.categories.all %}{%if forloop.counter0 %}, {%endif%}{{cat}}{%endfor%}{% for cat in item.categories.all %}{%if forloop.counter0 %}, {%endif%}{{cat}}{%endfor%}
{% trans "Emplacement" %}{{item_ref|ol_map:'map_ref_id'}}{{item|ol_map:'map_id'}}
{% trans "Description" %}{{item_ref.description|safe}}{{item.description|safe}}
{{property.propertymodel.name}}{{property_ref.value|safe}}{{property.value|safe}}
+
+
+

+ + {% trans "Back to list" %} + +

+ +
{% endblock %} diff --git a/chimere/templates/admin/chimere/marker/change_form.html b/chimere/templates/admin/chimere/marker/change_form.html index 808d3f8..21050bd 100644 --- a/chimere/templates/admin/chimere/marker/change_form.html +++ b/chimere/templates/admin/chimere/marker/change_form.html @@ -3,10 +3,10 @@ {% block field_sets %} {% if original.has_modified %}

-{% url 'admin:admin-modification' object_id as rapprochement_form %} -{% blocktrans %} -This item has a reference item associated to it. You should treat it via the rapprochement form. -{% endblocktrans %} + {% url 'admin:admin-marker-modification' object_id as rapprochement_form %} + {% blocktrans %} + This item has a reference item associated to it. You should treat it via the rapprochement form. + {% endblocktrans %}

{% endif %} {{ block.super }} diff --git a/chimere/templates/admin/chimere/route/change_form.html b/chimere/templates/admin/chimere/route/change_form.html deleted file mode 120000 index 21811b6..0000000 --- a/chimere/templates/admin/chimere/route/change_form.html +++ /dev/null @@ -1 +0,0 @@ -../marker/change_form.html \ No newline at end of file diff --git a/chimere/templates/admin/chimere/route/change_form.html b/chimere/templates/admin/chimere/route/change_form.html new file mode 100644 index 0000000..46ff490 --- /dev/null +++ b/chimere/templates/admin/chimere/route/change_form.html @@ -0,0 +1,14 @@ +{% extends "admin/change_form.html" %} +{% load i18n %} +{% block field_sets %} +{% if original.has_modified %} +

+ {% url 'admin:admin-route-modification' object_id as rapprochement_form %} + {% blocktrans %} + This item has a reference item associated to it. You should treat it via the rapprochement form. + {% endblocktrans %} +

+{% endif %} +{{ block.super }} +{% endblock %} + diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py index c5cd555..1d15997 100644 --- a/chimere/templatetags/chimere_tags.py +++ b/chimere/templatetags/chimere_tags.py @@ -372,6 +372,8 @@ def ol_map(item, arg='map_id'): geom = item.point elif hasattr(item, 'route'): geom = item.route + elif hasattr(item, 'polygon'): + geom = item.polygon rendered = render_to_string('chimere/blocks/ol_map.html', {'geom': geom, 'map_id': arg}) return rendered -- cgit v1.2.3