From d22246688247e41e0ddefa082dd56819968177f7 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 29 Sep 2025 09:56:05 -0400 Subject: [PATCH] Fixes #20245: Fix Markdown preview functionality within "quick add" modal --- netbox/netbox/views/generic/object_views.py | 3 ++- netbox/project-static/dist/netbox.js | Bin 382895 -> 382807 bytes netbox/project-static/dist/netbox.js.map | Bin 1774576 -> 1774114 bytes .../src/buttons/markdownPreview.ts | 11 ----------- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/netbox/netbox/views/generic/object_views.py b/netbox/netbox/views/generic/object_views.py index 42407963d..4e8c3ad86 100644 --- a/netbox/netbox/views/generic/object_views.py +++ b/netbox/netbox/views/generic/object_views.py @@ -238,7 +238,8 @@ class ObjectEditView(GetReturnURLMixin, BaseObjectView): model = self.queryset.model initial_data = normalize_querydict(request.GET) - form = self.form(instance=obj, initial=initial_data) + form_prefix = 'quickadd' if request.GET.get('_quickadd') else None + form = self.form(instance=obj, initial=initial_data, prefix=form_prefix) restrict_form_fields(form, request.user) context = { diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js index fa1a0bcd188ea95dcfbf3755b253340dfd163dd4..f4396002be6e6b095f37d2f46f27e91e29b8d812 100644 GIT binary patch delta 517 zcmZ3#Ui|tx@eQR~jJcc3wAvXN3nu^5PUOu^wN*;WFDc2-RnjS#oTH=4lAEeiuz9M^ zWP8qPCF%5fr3;`HMM+OTic`(&1y&6+{v$<3j}hJ1%qu1HfOt-2{PtR zUKFarSg`qcC_f8JL8?yfk#`Nuv>X?>tGp0}P=wk8!QWv|JCIYGCZl-piF|9XYEZZKU&fF{lq;FU=%QJD5rE25>!%SnkV>7eJbYVN@BF3`m3of!sPZ!`| zW}BXHoRww!YCC3c6`=6$Rx3SY9Dh4BT$Xp1ZFKD xk#X?>tGnP&7=wk8!QWv|JCIYGCZl-piF|9XYEZ82R&fF{lq;FU=%QJBlq-x{=!%SnkV>7eJbYVN@B6gq0?1wwot|sQ M%)UMABI{dL0CgALo&W#< diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map index 85c0c644b8d226194f74e92889f813cba15250a8..fb4435ea4bc1bcfea4bac780c64f0f62cb4c594d 100644 GIT binary patch delta 222 zcmeycJZI68oQ4+07N!>F7M2#)7Pc1l7LFFq7OpMaU0=3u`obN|G~I@mpQBy=2R9J& z05LBR^8qnG5DNgYAP@@yu`m#e0I}$H`5$6ZHB1@q)2&Oy%S4@ZTpb;gbuyhC9W$MD z3V~Fyllyd+QgKyrH;`1Yjz5S1vfP1$bDoRq^oCM#6-JloOH0LFghx{5E)xf02_Tl-Ze1p2pRj$xHK_z!0F6#dbN~PV delta 627 zcmY+B&1(}u7{*DgA8Bed>BnkLuc2aEhU6d$rIa$eP1CI`ZCSxf4%sH7JGyM*&Lp;^ zr9uY^#rxhx@gER!^X$o!*Zv8Dhtjj}?AD@(-|Rax&-1)5vmZYNzrO_URYqmiH8r8G zs~hU3x}|bz@@xL|Jl>v|%Ei?mlf{CFI`x6%!K39?*b2v|=Xp1KO$ z^q(A5yV~5;K^S3EE3~k5=;n-;bqGf%H_6*1;92}Z7!QrjG$Ao3Ltt*WX2;)!F`wCp ze+i>8ZDSUFYU=qOTV#jQ7u#_|8c%X{lM)x(?wlM;1G$IXA0Nx|YP J`&sU;`~g46)#CsF diff --git a/netbox/project-static/src/buttons/markdownPreview.ts b/netbox/project-static/src/buttons/markdownPreview.ts index 224b2beab..eb8657930 100644 --- a/netbox/project-static/src/buttons/markdownPreview.ts +++ b/netbox/project-static/src/buttons/markdownPreview.ts @@ -1,5 +1,3 @@ -import { isTruthy } from 'src/util'; - /** * interface for htmx configRequest event */ @@ -17,15 +15,6 @@ function initMarkdownPreview(markdownWidget: HTMLDivElement) { const textarea = markdownWidget.querySelector('textarea') as HTMLTextAreaElement; const preview = markdownWidget.querySelector('div.preview') as HTMLDivElement; - /** - * Make sure the textarea has style attribute height - * So that it can be copied over to preview div. - */ - if (!isTruthy(textarea.style.height)) { - const { height } = textarea.getBoundingClientRect(); - textarea.style.height = `${height}px`; - } - /** * Add the value of the textarea to the body of the htmx request * and copy the height of text are to the preview div