summaryrefslogtreecommitdiff
path: root/ishtar_common/admin.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2024-03-08 11:02:06 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2024-03-08 11:02:06 +0100
commitb8f302003c6c9eda078eceea16e3dd0546b6aea2 (patch)
tree7c940a4d1f4572fcbe00612a506fa2ba61a416a3 /ishtar_common/admin.py
parenta3f6cb07e8e2340196530d9bca7466a83ab364d0 (diff)
downloadIshtar-b8f302003c6c9eda078eceea16e3dd0546b6aea2.tar.bz2
Ishtar-b8f302003c6c9eda078eceea16e3dd0546b6aea2.zip
🏷️ update french states and departments
Diffstat (limited to 'ishtar_common/admin.py')
-rw-r--r--ishtar_common/admin.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index ae521729d..ae0f9eb3f 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -1196,7 +1196,6 @@ class ImportJSONActionAdmin(admin.ModelAdmin):
with open(filename, "wb+") as zipped_file:
for chunk in request.FILES["json_file"].chunks():
zipped_file.write(chunk)
- result = None
result = restore_serialized(filename)
try:
result = restore_serialized(filename)
@@ -1431,7 +1430,7 @@ class CreateAreaForm(forms.Form):
area = self.cleaned_data.get("area", 0)
if (not area_name and not area) or (area and area_name):
raise forms.ValidationError(
- _("Choose an area or set an area " "reference.")
+ _("Choose an area or set an area reference.")
)
return self.cleaned_data
@@ -1469,8 +1468,10 @@ class CreateDepartmentActionAdmin(GeneralTypeAdmin):
form = CreateAreaForm(request.POST)
if form.is_valid():
area_name = form.cleaned_data.get("area_name", "")
+ dpt_num = form.cleaned_data["department_number"]
+ dpt_num = "0" + str(dpt_num) if dpt_num < 10 else str(dpt_num)
if area_name:
- slug = "dpt-" + area_name
+ slug = "dep-" + dpt_num
while models.Area.objects.filter(txt_idx=slug).count():
slug += "b"
area = models.Area.objects.create(label=area_name, txt_idx=slug)
@@ -1479,8 +1480,6 @@ class CreateDepartmentActionAdmin(GeneralTypeAdmin):
)
else:
area = models.Area.objects.get(id=form.cleaned_data["area"])
- dpt_num = form.cleaned_data["department_number"]
- dpt_num = "0" + str(dpt_num) if dpt_num < 10 else str(dpt_num)
current_towns = [a.numero_insee for a in area.towns.all()]
nb = 0
for town in (