Fix elevation overlap, add device images, rack merge, and size override

- Fix elevation rendering bug: device blocks were drawn MARGIN px
  further right than the rack frame/unit slots, causing them to
  overlap and extend past the right border. All three now share one
  RACK_X origin.
- Show the device type's front/rear image inside each elevation block
  (clipped to the block, translucent label bar on top for legibility)
  when one is set on the device type; falls back to a plain colour
  block with text otherwise.
- Add "Merge" action to combine two concepts into one taller one (e.g.
  two half-height racks stacked into a full-height rack): the top
  concept's devices are shifted up by the bottom concept's height,
  neither source is modified. Available from the plugin menu, from a
  concept's detail page, and via POST /concepts/merge/.
- Copying a real rack into a concept can now target a different width,
  height and/or starting unit than the source rack; devices that no
  longer fit at the chosen size are skipped and reported as warnings
  instead of aborting the copy.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
2026-09-16 09:35:18 +02:00
co-authored by Claude Sonnet 5
parent a705b64c22
commit 777ded3900
13 changed files with 432 additions and 22 deletions
+59 -1
View File
@@ -22,6 +22,7 @@ from .models import ConceptDevice, RackConcept
__all__ = (
'ConceptDeviceView',
'MergeConceptsView',
'RackConceptView',
)
@@ -201,7 +202,7 @@ class RackCopyView(ObjectPermissionRequiredMixin, View):
if form.is_valid():
try:
concept = deploy.copy_rack_to_concept(
concept, warnings = deploy.copy_rack_to_concept(
rack=rack,
name=form.cleaned_data['name'],
status=form.cleaned_data['status'],
@@ -210,10 +211,15 @@ class RackCopyView(ObjectPermissionRequiredMixin, View):
description=form.cleaned_data['description'],
include_devices=form.cleaned_data['include_devices'],
include_device_names=form.cleaned_data['include_device_names'],
override_width=form.cleaned_data['override_width'],
override_u_height=form.cleaned_data['override_u_height'],
override_starting_unit=form.cleaned_data['override_starting_unit'],
)
except ValidationError as exc:
form.add_error(None, exc)
else:
for warning in warnings:
messages.warning(request, warning)
messages.success(request, _('Created concept %(concept)s from rack %(rack)s.') % {
'concept': concept, 'rack': rack
})
@@ -227,6 +233,58 @@ class RackCopyView(ObjectPermissionRequiredMixin, View):
})
class MergeConceptsView(ObjectPermissionRequiredMixin, View):
"""Stack two blueprints (e.g. two half-height racks) into one taller concept."""
queryset = RackConcept.objects.all()
def get_required_permission(self):
return 'netbox_rack_concept.add_rackconcept'
def get(self, request):
form = forms.MergeConceptsForm(initial={
'concept_bottom': request.GET.get('concept_bottom'),
'concept_top': request.GET.get('concept_top'),
})
return render(request, 'netbox_rack_concept/concept_merge.html', {
'form': form,
'return_url': reverse('plugins:netbox_rack_concept:rackconcept_list'),
})
def post(self, request):
form = forms.MergeConceptsForm(request.POST)
if form.is_valid():
try:
merged, warnings = deploy.merge_concepts(
concept_bottom=form.cleaned_data['concept_bottom'],
concept_top=form.cleaned_data['concept_top'],
name=form.cleaned_data['name'],
status=form.cleaned_data['status'],
tenant=form.cleaned_data['tenant'],
tenant_group=form.cleaned_data['tenant_group'],
width=form.cleaned_data['width'],
u_height=form.cleaned_data['u_height'],
starting_unit=form.cleaned_data['starting_unit'],
description=form.cleaned_data['description'],
)
except ValidationError as exc:
form.add_error(None, exc)
else:
for warning in warnings:
messages.warning(request, warning)
messages.success(request, _('Created %(merged)s by merging %(bottom)s and %(top)s.') % {
'merged': merged,
'bottom': form.cleaned_data['concept_bottom'],
'top': form.cleaned_data['concept_top'],
})
return redirect(merged.get_absolute_url())
return render(request, 'netbox_rack_concept/concept_merge.html', {
'form': form,
'return_url': reverse('plugins:netbox_rack_concept:rackconcept_list'),
})
@register_model_view(RackConcept, 'clone_concept', path='clone')
class RackConceptCloneView(ObjectPermissionRequiredMixin, View):
"""Duplicate a concept to build a variant."""