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

fix handling of filtered-by properties

Browse Source
This commit is contained in:
checktheroads
2021-03-19 09:26:39 -07:00
parent 5fdf2d3416
commit 1ea208ba00
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/project-static/src/select/api.ts
View File

@ -36,9 +36,10 @@ const DISABLED_ATTRIBUTES = ['occupied'] as string[];
const REPLACE_PATTERNS = [ const REPLACE_PATTERNS = [
// Don't query `termination_a_device=1`, but rather `device=1`. // Don't query `termination_a_device=1`, but rather `device=1`.
[new RegExp(/termination_(a|b)_(.+)/g), '$2_id'], [new RegExp(/termination_(a|b)_(.+)/g), '$2_id'],
// For example, a tenant's group relationship field is `group`, but the field name // A tenant's group relationship field is `group`, but the field name is `tenant_group`.
// is `tenant_group`. [new RegExp(/tenant_(group)/g), '$1_id'],
[new RegExp(/.+_(group)/g), '$1_id'], // Append `_id` to any fields
[new RegExp(/^([A-Za-z0-9]+)(_id)?$/g), '$1_id'],
] as ReplaceTuple[]; ] as ReplaceTuple[];
const PLACEHOLDER = { const PLACEHOLDER = {
@ -248,6 +249,7 @@ export function initApiSelect() {
// Check the query param key to see if we should modify it. // Check the query param key to see if we should modify it.
if (key.match(pattern)) { if (key.match(pattern)) {
key = key.replaceAll(pattern, replacement); key = key.replaceAll(pattern, replacement);
break;
} }
} }
@ -282,6 +284,7 @@ export function initApiSelect() {
// Check the query param key to see if we should modify it. // Check the query param key to see if we should modify it.
if (name.match(pattern)) { if (name.match(pattern)) {
name = name.replaceAll(pattern, replacement); name = name.replaceAll(pattern, replacement);
break;
} }
} }