From e22efa3330e3682cfc35cc00d6fb254fab038a15 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 9 Jul 2015 18:04:36 +0200 Subject: Parcels: simply manage parcel association on wizards --- archaeological_operations/wizards.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'archaeological_operations/wizards.py') diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py index 1e4de70b7..b31e7b7f6 100644 --- a/archaeological_operations/wizards.py +++ b/archaeological_operations/wizards.py @@ -109,9 +109,18 @@ class OperationWizard(Wizard): def get_available_parcels(self, file): parcels = [] + current_parcels = [] + operation = self.get_current_object() + for parcel in operation.parcels.all(): + current_parcels.append((parcel.town, parcel.section, + parcel.parcel_number)) + parcels.append((parcel.pk, parcel.short_label)) try: - parcels = [(parcel.pk, parcel.short_label) - for parcel in file.parcels.all()] + for parcel in file.parcels.all(): + if (parcel.town, parcel.section, parcel.parcel_number) \ + in current_parcels: + continue + parcels.append((parcel.pk, parcel.short_label)) except (ValueError, ObjectDoesNotExist): pass return sorted(parcels, key=lambda x:x[1]) -- cgit v1.2.3