paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-09 09:58:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use 1/0 instead of true/false

Browse Source
This commit is contained in:
Michael Shamoon 2022-05-20 22:23:35 -07:00
parent f6d78a0044
commit 1c83f489d1
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
View File

@ -313,7 +313,10 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
break break
case FILTER_ASN_ISNULL: case FILTER_ASN_ISNULL:
this.textFilterTarget = TEXT_FILTER_TARGET_ASN this.textFilterTarget = TEXT_FILTER_TARGET_ASN
this.textFilterModifier = TEXT_FILTER_MODIFIER_NULL this.textFilterModifier =
rule.value == 'true' || rule.value == '1'
? TEXT_FILTER_MODIFIER_NULL
: TEXT_FILTER_MODIFIER_NOTNULL
break break
case FILTER_ASN_GT: case FILTER_ASN_GT:
this.textFilterTarget = TEXT_FILTER_TARGET_ASN this.textFilterTarget = TEXT_FILTER_TARGET_ASN

13
src-ui/src/app/utils/query-params.ts
View File

@ -15,7 +15,7 @@ export function generateParams(
): Params { ): Params {
let params = {} let params = {}
params[SORT_FIELD_PARAMETER] = sortField params[SORT_FIELD_PARAMETER] = sortField
params[SORT_REVERSE_PARAMETER] = sortReverse params[SORT_REVERSE_PARAMETER] = sortReverse ? 1 : undefined
params[PAGE_PARAMETER] = isNaN(currentPage) ? 1 : currentPage params[PAGE_PARAMETER] = isNaN(currentPage) ? 1 : currentPage
return { return {
...queryParamsFromFilterRules(filterRules), ...queryParamsFromFilterRules(filterRules),
@ -41,7 +41,9 @@ export function getStateFromQueryParams(queryParams: ParamMap): ListViewState {
} }
} }
export function filterRulesFromQueryParams(queryParams: ParamMap) { export function filterRulesFromQueryParams(
queryParams: ParamMap
): FilterRule[] {
const allFilterRuleQueryParams: string[] = FILTER_RULE_TYPES.map( const allFilterRuleQueryParams: string[] = FILTER_RULE_TYPES.map(
(rt) => rt.filtervar (rt) => rt.filtervar
) )
@ -67,6 +69,8 @@ export function filterRulesFromQueryParams(queryParams: ParamMap) {
filterRulesFromQueryParams = filterRulesFromQueryParams.concat( filterRulesFromQueryParams = filterRulesFromQueryParams.concat(
// map all values to filter rules // map all values to filter rules
filterQueryParamValues.map((val) => { filterQueryParamValues.map((val) => {
if (rule_type.datatype == 'boolean')
val = val.replace('1', 'true').replace('0', 'false')
return { return {
rule_type: rule_type.id, rule_type: rule_type.id,
value: isNullRuleType ? null : val, value: isNullRuleType ? null : val,
@ -88,9 +92,12 @@ export function queryParamsFromFilterRules(filterRules: FilterRule[]): Params {
? params[ruleType.filtervar] + ',' + rule.value ? params[ruleType.filtervar] + ',' + rule.value
: rule.value : rule.value
} else if (ruleType.isnull_filtervar && rule.value == null) { } else if (ruleType.isnull_filtervar && rule.value == null) {
params[ruleType.isnull_filtervar] = true params[ruleType.isnull_filtervar] = 1
} else { } else {
params[ruleType.filtervar] = rule.value params[ruleType.filtervar] = rule.value
if (ruleType.datatype == 'boolean')
params[ruleType.filtervar] =
rule.value == 'true' || rule.value == '1' ? 1 : 0
} }
} }
return params return params