Skip to content

Commit fbe76ac

Browse files
committed
Fix non-existent-id error message
Change this one special case to also use the same communication channel (toast notification) and message format as all other validation errors. The error message is kept mostly the same, just the index prefix is removed. This allowed keeping and easily adjusting the existing localizations of it.
1 parent 1245a9f commit fbe76ac

File tree

16 files changed

+36
-32
lines changed

16 files changed

+36
-32
lines changed

netbox/netbox/views/generic/bulk_views.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ def post(self, request):
323323

324324
class BulkImportView(GetReturnURLMixin, BaseMultiObjectView):
325325
"""
326-
Import objects in bulk (CSV format).
326+
Import objects in bulk (CSV/JSON/YAML format).
327327
328328
Attributes:
329329
model_form: The form used to create each imported object
@@ -456,8 +456,12 @@ def create_and_update_objects(self, form, request):
456456
try:
457457
instance = prefetched_objects[object_id]
458458
except KeyError:
459-
form.add_error('data', _("Row {i}: Object with ID {id} does not exist").format(i=i, id=object_id))
460-
raise ValidationError('')
459+
raise ValidationError(
460+
self._compile_form_errors(
461+
{'id': [_("Object with ID {id} does not exist").format(id=object_id)]},
462+
index=i
463+
)
464+
)
461465

462466
# Take a snapshot for change logging
463467
if instance.pk and hasattr(instance, 'snapshot'):

netbox/translations/cs/LC_MESSAGES/django.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12822,8 +12822,8 @@ msgstr ""
1282212822

1282312823
#: netbox/netbox/views/generic/bulk_views.py:442
1282412824
#, python-brace-format
12825-
msgid "Row {i}: Object with ID {id} does not exist"
12826-
msgstr "Řádek {i}: Objekt s ID {id} neexistuje"
12825+
msgid "Object with ID {id} does not exist"
12826+
msgstr "Objekt s ID {id} neexistuje"
1282712827

1282812828
#: netbox/netbox/views/generic/bulk_views.py:525
1282912829
#, python-brace-format

netbox/translations/da/LC_MESSAGES/django.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12857,8 +12857,8 @@ msgstr ""
1285712857

1285812858
#: netbox/netbox/views/generic/bulk_views.py:442
1285912859
#, python-brace-format
12860-
msgid "Row {i}: Object with ID {id} does not exist"
12861-
msgstr "Række {i}: Objekt med ID {id} findes ikke"
12860+
msgid "Object with ID {id} does not exist"
12861+
msgstr "Objekt med ID {id} findes ikke"
1286212862

1286312863
#: netbox/netbox/views/generic/bulk_views.py:525
1286412864
#, python-brace-format

netbox/translations/de/LC_MESSAGES/django.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13055,8 +13055,8 @@ msgstr ""
1305513055

1305613056
#: netbox/netbox/views/generic/bulk_views.py:442
1305713057
#, python-brace-format
13058-
msgid "Row {i}: Object with ID {id} does not exist"
13059-
msgstr "Reihe {i}: Objekt mit ID {id} existiert nicht"
13058+
msgid "Object with ID {id} does not exist"
13059+
msgstr "Objekt mit ID {id} existiert nicht"
1306013060

1306113061
#: netbox/netbox/views/generic/bulk_views.py:525
1306213062
#, python-brace-format

netbox/translations/en/LC_MESSAGES/django.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12513,7 +12513,7 @@ msgstr ""
1251312513

1251412514
#: netbox/netbox/views/generic/bulk_views.py:442
1251512515
#, python-brace-format
12516-
msgid "Row {i}: Object with ID {id} does not exist"
12516+
msgid "Object with ID {id} does not exist"
1251712517
msgstr ""
1251812518

1251912519
#: netbox/netbox/views/generic/bulk_views.py:525

netbox/translations/es/LC_MESSAGES/django.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12999,8 +12999,8 @@ msgstr ""
1299912999

1300013000
#: netbox/netbox/views/generic/bulk_views.py:442
1300113001
#, python-brace-format
13002-
msgid "Row {i}: Object with ID {id} does not exist"
13003-
msgstr "Fila {i}: Objeto con ID {id} no existe"
13002+
msgid "Object with ID {id} does not exist"
13003+
msgstr "Objeto con ID {id} no existe"
1300413004

1300513005
#: netbox/netbox/views/generic/bulk_views.py:525
1300613006
#, python-brace-format

netbox/translations/fr/LC_MESSAGES/django.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13041,8 +13041,8 @@ msgstr ""
1304113041

1304213042
#: netbox/netbox/views/generic/bulk_views.py:442
1304313043
#, python-brace-format
13044-
msgid "Row {i}: Object with ID {id} does not exist"
13045-
msgstr "Rangée {i}: Objet avec identifiant {id} n'existe pas"
13044+
msgid "Object with ID {id} does not exist"
13045+
msgstr "Objet avec identifiant {id} n'existe pas"
1304613046

1304713047
#: netbox/netbox/views/generic/bulk_views.py:525
1304813048
#, python-brace-format

netbox/translations/it/LC_MESSAGES/django.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13033,8 +13033,8 @@ msgstr ""
1303313033

1303413034
#: netbox/netbox/views/generic/bulk_views.py:442
1303513035
#, python-brace-format
13036-
msgid "Row {i}: Object with ID {id} does not exist"
13037-
msgstr "Fila {i}: Oggetto con ID {id} non esiste"
13036+
msgid "Object with ID {id} does not exist"
13037+
msgstr "Oggetto con ID {id} non esiste"
1303813038

1303913039
#: netbox/netbox/views/generic/bulk_views.py:525
1304013040
#, python-brace-format

netbox/translations/ja/LC_MESSAGES/django.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12645,8 +12645,8 @@ msgstr "選択したエクスポートテンプレートをレンダリング中
1264512645

1264612646
#: netbox/netbox/views/generic/bulk_views.py:442
1264712647
#, python-brace-format
12648-
msgid "Row {i}: Object with ID {id} does not exist"
12649-
msgstr "行 {i}: ID {id}のオブジェクトは存在しません"
12648+
msgid "Object with ID {id} does not exist"
12649+
msgstr "ID {id}のオブジェクトは存在しません"
1265012650

1265112651
#: netbox/netbox/views/generic/bulk_views.py:525
1265212652
#, python-brace-format

netbox/translations/nl/LC_MESSAGES/django.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13000,8 +13000,8 @@ msgstr ""
1300013000

1300113001
#: netbox/netbox/views/generic/bulk_views.py:442
1300213002
#, python-brace-format
13003-
msgid "Row {i}: Object with ID {id} does not exist"
13004-
msgstr "Rij {i}: Object met ID {id} bestaat niet"
13003+
msgid "Object with ID {id} does not exist"
13004+
msgstr "Object met ID {id} bestaat niet"
1300513005

1300613006
#: netbox/netbox/views/generic/bulk_views.py:525
1300713007
#, python-brace-format

0 commit comments

Comments
 (0)