From a582d1c634458ace4b15b4ca6a5be4a708e7e72c Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 25 Jan 2021 11:18:13 +0100 Subject: Admin: merge parcels --- archaeological_operations/admin.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'archaeological_operations/admin.py') diff --git a/archaeological_operations/admin.py b/archaeological_operations/admin.py index 3d844e944..312f2c3d3 100644 --- a/archaeological_operations/admin.py +++ b/archaeological_operations/admin.py @@ -28,7 +28,8 @@ from django.contrib.gis.forms import PointField, MultiPolygonField, OSMWidget from ishtar_common.utils import ugettext_lazy as _ from ishtar_common.apps import admin_site -from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin +from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin, \ + MergeActionAdmin from . import models @@ -131,7 +132,7 @@ class OperationAdmin(HistorizedObjectAdmin): admin_site.register(models.Operation, OperationAdmin) -class ParcelAdmin(HistorizedObjectAdmin): +class ParcelAdmin(MergeActionAdmin, HistorizedObjectAdmin): list_display = ['section', 'parcel_number', 'operation', 'associated_file'] search_fields = ('operation__cached_label', 'associated_file__cached_label', -- cgit v1.2.3