lgcosta/paperless-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweak add expression

Browse Source
This commit is contained in:
shamoon 2024-09-03 11:14:52 -07:00
parent d19b08e1b9
commit 000a40aa82
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
View File

@ -62,7 +62,7 @@
</ng-template> </ng-template>
<ng-template #queryExpression let-query="query"> <ng-template #queryExpression let-query="query">
<div class="d-flex flex-column border border-primary rounded px-2 pt-2"> <div class="d-flex flex-column border border-primary rounded px-2 pt-2 w-100">
<div class="btn-group btn-group-xs" role="group"> <div class="btn-group btn-group-xs" role="group">
<input [(ngModel)]="query.operator" type="radio" class="btn-check" id="logicalOperatorAnd_{{query.field}}" name="logicalOperatorAnd_{{query.field}}" value="AND"> <input [(ngModel)]="query.operator" type="radio" class="btn-check" id="logicalOperatorAnd_{{query.field}}" name="logicalOperatorAnd_{{query.field}}" value="AND">
<label class="btn btn-outline-primary" for="logicalOperatorAnd_{{query.field}}" i18n>And</label> <label class="btn btn-outline-primary" for="logicalOperatorAnd_{{query.field}}" i18n>And</label>

10
src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.ts
View File

@ -55,9 +55,15 @@ export class CustomFieldQueriesModel {
if (this.queries[0].type === CustomFieldQueryElementType.Atom) { if (this.queries[0].type === CustomFieldQueryElementType.Atom) {
expression.value = this.queries as CustomFieldQueryAtom[] expression.value = this.queries as CustomFieldQueryAtom[]
this.queries = [] this.queries = []
}
}
this.queries.push(expression) this.queries.push(expression)
} else {
;((this.queries[0] as CustomFieldQueryExpression).value as any[]).push(
expression
)
}
} else {
this.queries.push(expression)
}
expression.changed.subscribe(() => { expression.changed.subscribe(() => {
this.changed.next(this) this.changed.next(this)
}) })