From 44586743ea410e9df11d88ca3580ccc08a71bd17 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 19 Jul 2022 14:21:20 -0400 Subject: [PATCH] Fixes #9437: Standardize form submission buttons and behavior when using enter key --- docs/release-notes/version-3.2.md | 1 + netbox/project-static/dist/netbox.js | Bin 376156 -> 375907 bytes netbox/project-static/dist/netbox.js.map | Bin 345579 -> 345348 bytes netbox/project-static/src/forms/elements.ts | 40 +--------------- .../circuits/circuittermination_edit.html | 14 ------ netbox/templates/dcim/interface_edit.html | 11 ----- netbox/templates/generic/bulk_delete.html | 2 +- netbox/templates/generic/bulk_edit.html | 2 +- netbox/templates/generic/bulk_import.html | 12 ++--- netbox/templates/generic/bulk_remove.html | 2 +- netbox/templates/generic/bulk_rename.html | 2 +- .../templates/generic/confirmation_form.html | 45 +++++++----------- netbox/templates/generic/object_edit.html | 8 ++-- netbox/templates/generic/object_import.html | 30 ++++++------ .../virtualization/vminterface_edit.html | 11 ----- 15 files changed, 49 insertions(+), 131 deletions(-) diff --git a/docs/release-notes/version-3.2.md b/docs/release-notes/version-3.2.md index 6718fc247..7b9adb374 100644 --- a/docs/release-notes/version-3.2.md +++ b/docs/release-notes/version-3.2.md @@ -9,6 +9,7 @@ ### Bug Fixes +* [#9437](https://github.com/netbox-community/netbox/issues/9437) - Standardize form submission buttons and behavior when using enter key * [#9634](https://github.com/netbox-community/netbox/issues/9634) - Fix image URLs in rack elevations when using external storage * [#9715](https://github.com/netbox-community/netbox/issues/9715) - Fix `SOCIAL_AUTH_PIPELINE` config parameter not taking effect * [#9754](https://github.com/netbox-community/netbox/issues/9754) - Fix regression introduced by #9632 diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js index 3b9d253c910687cab913fa4410ebf02d56259832..9ea2e5c7c51459ff2a2b51720f271929a0119eb8 100644 GIT binary patch delta 3383 zcmb7GdstOf7XQ|{dz(sF#zRR(K*W3F=twe-f!E}ra+UW(c}ViQyzb>(4qQOEV4{+s z@^T9sfv|jKIzIT0cqq#fXTGT{r>6OQKT54E&9te$a>l+{2elgGpZVi{zrFT)?e*Jh z?Q_rHali7T`+>DpF0y1?tdEt%aLFLfmyFSNz05kRu7IqpaJ=CL7A3fKB0wxl+n4~+ z%KnXW0SehI<^Y*lH)TKs`(V=mgtC^lVwlgMJ<-XxP+XL6FwSu-%4Y#R6Ie}qC{(ex z+xNl}ChvsQYwIrU4FR?N?Gz&2ARr@t!)6= z%Bt;M0J+R_Cx;w%Xy+ctXIZbsOzHC}m8)3}9jnuVo;uU%f^(T5r9cji1H{B4-s%Z% z%=O4>S{NY4+!uR~aEMS$Z@CM|amLX~@MUL@o<%AZX_3R0Bmf63Az zpX_gkVF8PIXA;s``c4llRGxU(05mQ@l=22sC`s?tfsh)&&L7`L&9Z2_x6QV{e+e00 z^FbR(%9AJJfR@N&)_s?{zc&(EAd3n2W$~Xkf!bs-@xB~*vP*zW_TgzOSQX=$TBM)7 zb+!uG4?4$?{S)W9Az!ha9}7tTnhRHu`233wK*q0LvO%Si_{mH_%GZBdj+6_Rcj%Dv zU7vM81q=Cn6D(&ZKYs@j*_JQ<1u+V{HeZMIpS|9U^cUV(iS)DUUk^aIvhQXBB~h{% z!g_DIE91UCaJVKV{;AVBT%pV^KlhwBY1VG&^Czyhe;RM^%CLNp;AX+UP2LDHr z-VsA2Q85Yj)r0sd#@{MHys8@o&7&YiW#eHtz#=}!6QW_E+UN-v@Jb`N)eAO(nS(d% z1-rW68$PB`pst<*=LN9wjHjR+O4UN68bwHRCcdGfiGLab?%eZL@(3Sa4}R*U zXJGj-kk#b5nx)K-guq0oQZI(Uw*X7jkHVmLI9VJj#{aLQUOgTO>5rg;ArZ3Be?ubZ zN0X#bu~0LNc80uH992wyuP{^3XAGtJZOj$m}d5i|NcDAdQ#PhTeC`SR`v*S{SuRT<+; z^zr%Jc2no3+P>Be0OYGrf1``U2U&gow(d!14Ac3uE()Vw`&swp*x?nSnoD`E=Hjk? zGluNK3V4SnnT&8`5Y(%lWPCD2s8B(?hx71i^0@ks=gB;9&BSYV)IunO3V$Q20YSpP(@HRwEe!u2HD@T{+IpWU0Gp2#uuY-sf~K zd}A|tn*Y>9T(Gv&&BRV|IHTG~HkR1iMiNFwYrca7@!Jbw0{3qxcU|L$2&m5Hgo2OB zBw9>jlu3*=iSZ^e+LUgvOZwk5ccGfyLBfFRxt5c^zL``)ArI^%et2bRo#Z7U!o-_4 zgC9@pAtU+JE`om-cvTk(f>7SqMS5U9PwXZe!Iyv0P1Zscx4lSeVF|zeB6%5-IO`#? z5UO77A)dp~boLH1k^Af*9%zs2IcV?LK{C<)!VZ#vkpp%TJtV2AJIM-w6n^FvvJQ`x zvx^uXTV&E>4?Gyc6ntzAtw2bnQctCk4yW?D^6(t69pk=cC~7Zzz(C z^QAOdtshO>Jf=M`4Ij$XQJz`ih2I&?UP=#6l=#ac9iwLX(^ntSp(oF@3r}+W463zs z^b8t@@X`$Gg)?w;20h^nHnk;$jwFa(^XT_e@E%)>=vwSi)x$4!V)@)C)ZFP zezKa{A)7C%p_kES+6ubFDMHd`O!9S@rJ4*LQcFC?>GA)M)uNZQDSCLy-d#ace&<0o zk8Cyed0HYs89!D_12A~wTI#_^t)hW^VGX7~x0<@DIjd*^Kn_2#njS-wjcaJMORmKb z{2-0_{xGAjANQ!kvdZ|ZIvR#9)pc|wt^Po=%4>ezBfD4V8R!15HBDyapNwdAz%U zPH-vu&7treAADinZ=eU!tacskADd+nD=p~;v!pfJuOEPUJZ?ShfMps?;?5iB6-;(} z1MP85unaNe+Zt&Q%;Ogu>2#N6zsWfGrllot?6))q`j5)LW~-*k;Z5}*3m|1xKuoR9(-djw$W)W%ZE@* zY^MSIcpH5Jy|dftObpi9PQP=)!#8iG)dJ$9J7_(2tlGAl{#(P=1GGWFr+1t}4d{ie zy75$n&c-!YXc=mp58@@=*CZUI5xDL?hyxPBef#L2P+HnYqY?J>(W$t3rjITi8L5%< U%d0n*FF8abAyVCbi1rWrFTc>I(f|Me delta 3660 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 C?*+2} diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map index 5a78b64f1000be47875ef11fdecfa3e13886291a..60656bc6d6f3450acca6ca6d4369da29b4749527 100644 GIT binary patch delta 49 zcmaFeE!xs0+R(z-!qmdNg(cOOr64uKdApz=iy|Xau*dW~f0k-CU*|GsbJy)({8_$# F1pt|^5fA_X delta 281 zcmXw!F^j@L5QS0G$(8;9Yez&l5y9ro=t)>|i^Lc$#Rvu>h+ZQWTBN$O_m2qvC~LXa zOoGkwcHev7&ZNJ!$6xK7meO)sxj8HEw2Rh4b6_Jh0uD?9X%AF;>hhgz0|i;<$g*&t7tG(M4-I})1DzozJjHgftYEmEEj%{ua|G - * Save & Continue - * - * ``` - * - * @param event Click event. - */ -function handleSubmitWithReturnUrl(event: MouseEvent): void { - const element = event.target as HTMLElement; - if (element.tagName === 'BUTTON') { - const button = element as HTMLButtonElement; - const action = button.getAttribute('return-url'); - const form = button.form; - if (form !== null && isTruthy(action)) { - form.action = action; - form.submit(); - } - } -} +import { getElements, scrollTo } from '../util'; function handleFormSubmit(event: Event, form: HTMLFormElement): void { // Track the names of each invalid field. @@ -57,15 +29,6 @@ function handleFormSubmit(event: Event, form: HTMLFormElement): void { } } -/** - * Attach event listeners to form buttons with the `return-url` attribute present. - */ -function initReturnUrlSubmitButtons(): void { - for (const button of getElements('button[return-url]')) { - button.addEventListener('click', handleSubmitWithReturnUrl); - } -} - /** * Attach an event listener to each form's submitter (button[type=submit]). When called, the * callback checks the validity of each form field and adds the appropriate Bootstrap CSS class @@ -82,5 +45,4 @@ export function initFormElements(): void { submitter.addEventListener('click', (event: Event) => handleFormSubmit(event, form)); } } - initReturnUrlSubmitButtons(); } diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html index f8393f945..8919bbd66 100644 --- a/netbox/templates/circuits/circuittermination_edit.html +++ b/netbox/templates/circuits/circuittermination_edit.html @@ -48,17 +48,3 @@ {% render_field form.description %} {% endblock %} - -{# Override buttons block, 'Create & Add Another'/'_addanother' is not needed on a circuit. #} -{% block buttons %} - Cancel - {% if object.pk %} - - {% else %} - - {% endif %} -{% endblock buttons %} diff --git a/netbox/templates/dcim/interface_edit.html b/netbox/templates/dcim/interface_edit.html index ddda1ae31..62aa54ef3 100644 --- a/netbox/templates/dcim/interface_edit.html +++ b/netbox/templates/dcim/interface_edit.html @@ -91,14 +91,3 @@ {% endif %} {% endblock %} - -{% block buttons %} - Cancel - {% if object.pk %} - - - {% else %} - - - {% endif %} -{% endblock %} diff --git a/netbox/templates/generic/bulk_delete.html b/netbox/templates/generic/bulk_delete.html index 1bcc2db1d..edc5132ce 100644 --- a/netbox/templates/generic/bulk_delete.html +++ b/netbox/templates/generic/bulk_delete.html @@ -36,8 +36,8 @@ Context: {{ field }} {% endfor %}
- Cancel + Cancel
diff --git a/netbox/templates/generic/bulk_edit.html b/netbox/templates/generic/bulk_edit.html index 362644135..cea50eaff 100644 --- a/netbox/templates/generic/bulk_edit.html +++ b/netbox/templates/generic/bulk_edit.html @@ -118,8 +118,8 @@ Context:
- Cancel + Cancel
diff --git a/netbox/templates/generic/bulk_import.html b/netbox/templates/generic/bulk_import.html index 1a85c3a21..1d638cb2c 100644 --- a/netbox/templates/generic/bulk_import.html +++ b/netbox/templates/generic/bulk_import.html @@ -44,12 +44,12 @@ Context:
-
- {% if return_url %} - Cancel - {% endif %} - -
+
+ + {% if return_url %} + Cancel + {% endif %} +
{% if fields %} diff --git a/netbox/templates/generic/bulk_remove.html b/netbox/templates/generic/bulk_remove.html index 0bda6adbc..6dc102b5a 100644 --- a/netbox/templates/generic/bulk_remove.html +++ b/netbox/templates/generic/bulk_remove.html @@ -23,8 +23,8 @@ {{ field }} {% endfor %}
- Cancel + Cancel
diff --git a/netbox/templates/generic/bulk_rename.html b/netbox/templates/generic/bulk_rename.html index 134d3df5a..ef6b18cae 100644 --- a/netbox/templates/generic/bulk_rename.html +++ b/netbox/templates/generic/bulk_rename.html @@ -34,11 +34,11 @@
- Cancel {% if '_preview' in request.POST and not form.errors %} {% endif %} + Cancel
diff --git a/netbox/templates/generic/confirmation_form.html b/netbox/templates/generic/confirmation_form.html index c4c15f7e7..e9d3d01aa 100644 --- a/netbox/templates/generic/confirmation_form.html +++ b/netbox/templates/generic/confirmation_form.html @@ -2,33 +2,24 @@ {% load form_helpers %} {% block content %} -
- -
- -
- {% csrf_token %} - {% for field in form.hidden_fields %} - {{ field }} - {% endfor %} - -
-
{% block confirmation_title %}{% endblock %}
- -
- {% block message %}

Are you sure?

{% endblock %} -
- -
- Cancel - -
- -
- -
- +
+
+
+ {% csrf_token %} + {% for field in form.hidden_fields %} + {{ field }} + {% endfor %} +
+
{% block confirmation_title %}{% endblock %}
+
+ {% block message %}

Are you sure?

{% endblock %} +
+
+ + Cancel +
- +
+
{% endblock %} diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html index 06308e9ef..892c7d2b1 100644 --- a/netbox/templates/generic/object_edit.html +++ b/netbox/templates/generic/object_edit.html @@ -94,19 +94,19 @@ Context:
{% block buttons %} - Cancel {% if object.pk %} {% else %} - + {% endif %} + Cancel {% endblock buttons %}
diff --git a/netbox/templates/generic/object_import.html b/netbox/templates/generic/object_import.html index ffa16b4c2..4d54fde61 100644 --- a/netbox/templates/generic/object_import.html +++ b/netbox/templates/generic/object_import.html @@ -5,19 +5,19 @@ {% block title %}{{ obj_type|bettertitle }} Import{% endblock %} {% block content %} -
-
-
- {% csrf_token %} - {% render_form form %} -
- {% if return_url %} - Cancel - {% endif %} - - -
-
-
-
+
+
+
+ {% csrf_token %} + {% render_form form %} +
+ + + {% if return_url %} + Cancel + {% endif %} +
+
+
+
{% endblock content %} diff --git a/netbox/templates/virtualization/vminterface_edit.html b/netbox/templates/virtualization/vminterface_edit.html index 496960a64..316900865 100644 --- a/netbox/templates/virtualization/vminterface_edit.html +++ b/netbox/templates/virtualization/vminterface_edit.html @@ -55,14 +55,3 @@
{% endif %} {% endblock %} - -{% block buttons %} - Cancel - {% if object.pk %} - - - {% else %} - - - {% endif %} -{% endblock %}