diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-01-25 11:18:13 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-28 12:15:24 +0100 |
| commit | 726575912e0c579048c1211219e2dbcf8f40a861 (patch) | |
| tree | bde8c2bdaad7cf4a3f080cc6f350caecea569b4f | |
| parent | 8c3283447d27fec8c493d0033917d6162f8d0ba1 (diff) | |
| download | Ishtar-726575912e0c579048c1211219e2dbcf8f40a861.tar.bz2 Ishtar-726575912e0c579048c1211219e2dbcf8f40a861.zip | |
Admin: merge parcels
| -rw-r--r-- | archaeological_operations/admin.py | 5 |
1 files changed, 3 insertions, 2 deletions
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', |