From 6e8b725ba77e4f2d0b52e8b28956b3701cafe9ca Mon Sep 17 00:00:00 2001
From: Guido Longoni <guido.longoni@briq.it>
Date: Wed, 5 Jul 2023 20:27:12 +0200
Subject: [PATCH] =?UTF-8?q?Cos=C3=AC=20=C3=A8=20pi=C3=B9=20facile=20config?=
 =?UTF-8?q?urare,=20ma=20va=20corretto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 django/contatti_app/admin.py | 43 +++++++++---------------------------
 1 file changed, 11 insertions(+), 32 deletions(-)

diff --git a/django/contatti_app/admin.py b/django/contatti_app/admin.py
index 146db9c..a45eb1a 100644
--- a/django/contatti_app/admin.py
+++ b/django/contatti_app/admin.py
@@ -140,28 +140,24 @@ class EmailAdmin(HiddenModel, PolymorphicParentModelAdmin, PolymorphicChildModel
     pass
 
 
-class RecapitoInline(StackedPolymorphicInline, DrillDownAutocompleteModelAdmin):
-    class IndirizzoInline(StackedPolymorphicInline.Child, DrillDownAutocompleteModelAdmin):
-        model = models.Indirizzo
-        autocomplete_fields = ('dug','comune','cap','nazione',)
-        drilldown_autocomplete_fields = {
+ddaf={
         'cap': {
             'linked': {
                 'comune': 'comuni',
             },
             'reset_on_included': {},
-            'reset_on_excluded': {},
+            'reset_on_excluded': ['comune'],
             'reset_on_reset': {},
             'autoupdate_on_reset': False,
             'autoselect_on_singleton': True,
-            'included_only': True,
+            'included_only': False,
         },
         'comune': {
             'linked': {
                 'cap': 'cap',
             },
             'reset_on_included': {},
-            'reset_on_excluded': {},
+            'reset_on_excluded': ['cap'],
             'reset_on_reset': {},
             'autoupdate_on_reset': False,
             'autoselect_on_singleton': True,
@@ -169,6 +165,12 @@ class RecapitoInline(StackedPolymorphicInline, DrillDownAutocompleteModelAdmin):
         }
     }
 
+class RecapitoInline(StackedPolymorphicInline, DrillDownAutocompleteModelAdmin):
+    class IndirizzoInline(StackedPolymorphicInline.Child, DrillDownAutocompleteModelAdmin):
+        model = models.Indirizzo
+        autocomplete_fields = ('dug','comune','cap','nazione',)
+        drilldown_autocomplete_fields = ddaf
+
     class SedeInline(StackedPolymorphicInline.Child):
         model = models.Sede
         autocomplete_fields = ('dug','comune','cap','nazione',)
@@ -291,30 +293,7 @@ class IndirizzoAdmin(HiddenModel, DrillDownAutocompleteModelAdmin, RicercaOrdina
     fields=('soggetto','dug','duf','civico','cap','comune','altro',)
     search_fields = ('soggetto','indirizzo','cap_id__exact',)
     autocomplete_fields = ('soggetto','dug','cap','comune',)
-    drilldown_autocomplete_fields = {
-        'cap': {
-            'linked': {
-                'comune': 'comuni',
-            },
-            'reset_on_included': {},
-            'reset_on_excluded': {},
-            'reset_on_reset': {},
-            'autoupdate_on_reset': False,
-            'autoselect_on_singleton': True,
-            'included_only': True,
-        },
-        'comune': {
-            'linked': {
-                'cap': 'cap',
-            },
-            'reset_on_included': {},
-            'reset_on_excluded': {},
-            'reset_on_reset': {},
-            'autoupdate_on_reset': False,
-            'autoselect_on_singleton': True,
-            'included_only': False,
-        }
-    }
+    drilldown_autocomplete_fields = ddaf
     list_display = ('soggetto','indirizzo', 'cap','comune','provincia','regione',)
     ordering = ('comune_id','duf','civico',)
     autocomplete_list_filter = ('comune',)