Merge conflict
This commit is contained in:
parent
a40cf3ed73
commit
c0cb6e2d79
@ -235,9 +235,9 @@ export class FilterEditorComponent
|
|||||||
}
|
}
|
||||||
|
|
||||||
case FILTER_HAS_CUSTOM_FIELDS_ANY:
|
case FILTER_HAS_CUSTOM_FIELDS_ANY:
|
||||||
return $localize`Custom fields include: ${this.customFields.find(
|
return $localize`Custom fields include: ${
|
||||||
(f) => f.id == +rule.value
|
this.customFields.find((f) => f.id == +rule.value)?.name
|
||||||
)?.name}`
|
}`
|
||||||
|
|
||||||
case FILTER_HAS_CUSTOM_FIELDS_ALL:
|
case FILTER_HAS_CUSTOM_FIELDS_ALL:
|
||||||
return $localize`Custom fields: ${
|
return $localize`Custom fields: ${
|
||||||
|
Loading…
x
Reference in New Issue
Block a user