NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 18:08:38 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Fixes #3999: Do not filter child results by null if non-required parent fields are blank

Browse Source
This commit is contained in:
Jeremy Stretch 2020-01-23 17:11:45 -05:00
parent cdecf93f00
commit 629712142f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.7.md
View File

@ -9,6 +9,7 @@
* [#3983](https://github.com/netbox-community/netbox/issues/3983) - Permit the creation of multiple unnamed devices * [#3983](https://github.com/netbox-community/netbox/issues/3983) - Permit the creation of multiple unnamed devices
* [#3989](https://github.com/netbox-community/netbox/issues/3989) - Correct HTTP content type assignment for webhooks * [#3989](https://github.com/netbox-community/netbox/issues/3989) - Correct HTTP content type assignment for webhooks
* [#3999](https://github.com/netbox-community/netbox/issues/3999) - Do not filter child results by null if non-required parent fields are blank
--- ---

7
netbox/project-static/js/forms.js
View File

@ -158,15 +158,18 @@ $(document).ready(function() {
filter_for_elements.each(function(index, filter_for_element) { filter_for_elements.each(function(index, filter_for_element) {
var param_name = $(filter_for_element).attr(attr_name); var param_name = $(filter_for_element).attr(attr_name);
var is_required = $(filter_for_element).attr("required");
var is_nullable = $(filter_for_element).attr("nullable"); var is_nullable = $(filter_for_element).attr("nullable");
var is_visible = $(filter_for_element).is(":visible"); var is_visible = $(filter_for_element).is(":visible");
var value = $(filter_for_element).val(); var value = $(filter_for_element).val();
if (param_name && is_visible && value) { if (param_name && is_visible) {
if (value) {
parameters[param_name] = value; parameters[param_name] = value;
} else if (param_name && is_visible && is_nullable) { } else if (is_required && is_nullable) {
parameters[param_name] = "null"; parameters[param_name] = "null";
} }
}
}); });
// Conditional query params // Conditional query params