github-starred/vikunja
2
0
Fork 0
mirror of https://github.com/go-vikunja/vikunja.git synced 2026-07-21 17:37:54 -05:00
Code Issues 690 Packages Projects Releases 11 Wiki Activity

fix(filters): use correct filter string instead of object

Browse Source
This commit is contained in:
kolaente
2025-01-21 14:18:50 +01:00
parent 9814ff9667
commit ccd79a7089
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/project/partials/FilterInput.vue
+8 -2
View File
@@ -64,7 +64,10 @@ watch(
},
)
function escapeHtml(unsafe: string): string {
function escapeHtml(unsafe: string|null|undefined): string {
if (!unsafe) {
return ''
}
return unsafe
.replace(/&/g, '&')
.replace(/</g, '&lt;')
@@ -73,7 +76,10 @@ function escapeHtml(unsafe: string): string {
.replace(/'/g, '&#039;')
}
function unEscapeHtml(unsafe: string): string {
function unEscapeHtml(unsafe: string|null|undefined): string {
if (!unsafe) {
return ''
}
return unsafe
.replace(/&amp;/g, '&')
.replace(/&lt;/g, '<')
frontend/src/components/project/views/ViewEditForm.vue
+3 -3
View File
@@ -77,10 +77,10 @@ function save() {
emit('update:modelValue', {
...view.value,
filter: transformFilterForApi(view.value?.filter || ''),
filter: transformFilterForApi(view.value?.filter?.filter || ''),
bucketConfiguration: view.value?.bucketConfiguration.map(bc => ({
title: bc.title,
filter: transformFilterForApi(bc.filter || ''),
filter: transformFilterForApi(bc.filter?.filter || ''),
})),
})
}
@@ -233,7 +233,7 @@ function handleBubbleSave() {
</div>
<FilterInput
v-model="view.bucketConfiguration[index].filter"
v-model="view.bucketConfiguration[index].filter.filter"
:project-id="view.projectId"
:input-label="$t('project.views.filter')"
class="mb-2"