mirror of
https://github.com/netbox-community/netbox.git
synced 2025-08-02 05:46:25 -06:00
Update to treat null name an empty string
This commit is contained in:
parent
ec3a7f3bcb
commit
f5e1b5aec6
@ -727,12 +727,6 @@ class BulkRenameView(GetReturnURLMixin, BaseMultiObjectView):
|
|||||||
renamed_pks = []
|
renamed_pks = []
|
||||||
|
|
||||||
for obj in selected_objects:
|
for obj in selected_objects:
|
||||||
# Validate that the rename will be successful and not trigger an error
|
|
||||||
if not form.cleaned_data['use_regex'] and not obj.name:
|
|
||||||
raise ValidationError({
|
|
||||||
'use_regex': 'You must use regex to rename and must pass uniqueness checks'
|
|
||||||
})
|
|
||||||
|
|
||||||
# Take a snapshot of change-logged models
|
# Take a snapshot of change-logged models
|
||||||
if hasattr(obj, 'snapshot'):
|
if hasattr(obj, 'snapshot'):
|
||||||
obj.snapshot()
|
obj.snapshot()
|
||||||
@ -746,7 +740,7 @@ class BulkRenameView(GetReturnURLMixin, BaseMultiObjectView):
|
|||||||
except re.error:
|
except re.error:
|
||||||
obj.new_name = obj.name
|
obj.new_name = obj.name
|
||||||
else:
|
else:
|
||||||
obj.new_name = obj.name.replace(find, replace)
|
obj.new_name = (obj.name or '').replace(find, replace)
|
||||||
renamed_pks.append(obj.pk)
|
renamed_pks.append(obj.pk)
|
||||||
|
|
||||||
return renamed_pks
|
return renamed_pks
|
||||||
@ -785,10 +779,6 @@ class BulkRenameView(GetReturnURLMixin, BaseMultiObjectView):
|
|||||||
messages.error(self.request, ", ".join(e.args))
|
messages.error(self.request, ", ".join(e.args))
|
||||||
clear_events.send(sender=self)
|
clear_events.send(sender=self)
|
||||||
|
|
||||||
except ValidationError as e:
|
|
||||||
messages.error(self.request, ", ".join(e.messages))
|
|
||||||
clear_events.send(sender=self)
|
|
||||||
|
|
||||||
except (AbortRequest, PermissionsViolation) as e:
|
except (AbortRequest, PermissionsViolation) as e:
|
||||||
logger.debug(e.message)
|
logger.debug(e.message)
|
||||||
form.add_error(None, e.message)
|
form.add_error(None, e.message)
|
||||||
|
Loading…
Reference in New Issue
Block a user