mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

#4108: Fix null choice population

Browse Source
This commit is contained in:
Jeremy Stretch
2020-02-10 10:57:23 -05:00
parent 3da6f22479
commit 26ca6b4a84
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,19 +220,19 @@ $(document).ready(function() {
} }
if( record.group !== undefined && record.group !== null && record.site !== undefined && record.site !== null ) { if( record.group !== undefined && record.group !== null && record.site !== undefined && record.site !== null ) {
results[record.site.name + ":" + record.group.name] = results[record.site.name + ":" + record.group.name] || { text: record.site.name + " / " + record.group.name, children: [] } results[record.site.name + ":" + record.group.name] = results[record.site.name + ":" + record.group.name] || { text: record.site.name + " / " + record.group.name, children: [] };
results[record.site.name + ":" + record.group.name].children.push(record); results[record.site.name + ":" + record.group.name].children.push(record);
} }
else if( record.group !== undefined && record.group !== null ) { else if( record.group !== undefined && record.group !== null ) {
results[record.group.name] = results[record.group.name] || { text: record.group.name, children: [] } results[record.group.name] = results[record.group.name] || { text: record.group.name, children: [] };
results[record.group.name].children.push(record); results[record.group.name].children.push(record);
} }
else if( record.site !== undefined && record.site !== null ) { else if( record.site !== undefined && record.site !== null ) {
results[record.site.name] = results[record.site.name] || { text: record.site.name, children: [] } results[record.site.name] = results[record.site.name] || { text: record.site.name, children: [] };
results[record.site.name].children.push(record); results[record.site.name].children.push(record);
} }
else if ( (record.group !== undefined || record.group == null) && (record.site !== undefined || record.site === null) ) { else if ( (record.group !== undefined || record.group == null) && (record.site !== undefined || record.site === null) ) {
results['global'] = results['global'] || { text: 'Global', children: [] } results['global'] = results['global'] || { text: 'Global', children: [] };
results['global'].children.push(record); results['global'].children.push(record);
} }
else { else {
@ -246,10 +246,9 @@ $(document).ready(function() {
// Handle the null option, but only add it once // Handle the null option, but only add it once
if (element.getAttribute('data-null-option') && data.previous === null) { if (element.getAttribute('data-null-option') && data.previous === null) {
var null_option = $(element).children()[0];
results.unshift({ results.unshift({
id: null_option.value, id: 'null',
text: null_option.text text: 'None'
}); });
} }