Merge develop into feature

This commit is contained in:
jeremystretch
2022-03-24 16:35:35 -04:00
parent ecb70f9e92
commit 4c052023db
11 changed files with 29 additions and 20 deletions

View File

@@ -878,8 +878,8 @@ class Device(NetBoxModel, ConfigContextModel):
if hasattr(self, 'device_type') and self.platform:
if self.platform.manufacturer and self.platform.manufacturer != self.device_type.manufacturer:
raise ValidationError({
'platform': "The assigned platform is limited to {} device types, but this device's type belongs "
"to {}.".format(self.platform.manufacturer, self.device_type.manufacturer)
'platform': f"The assigned platform is limited to {self.platform.manufacturer} device types, but "
f"this device's type belongs to {self.device_type.manufacturer}."
})
# A Device can only be assigned to a Cluster in the same Site (or no Site)