mirror of
https://github.com/IT4Change/gradido.git
synced 2026-02-06 09:56:05 +00:00
add memo search to find function, update placeholder in admin
This commit is contained in:
parent
9837014088
commit
5c5f1ebc9c
@ -5,7 +5,7 @@
|
||||
type="text"
|
||||
class="test-input-criteria"
|
||||
v-model="currentValue"
|
||||
:placeholder="$t('user_search')"
|
||||
:placeholder="$t('user_memo_search')"
|
||||
></b-form-input>
|
||||
<b-input-group-append class="test-click-clear-criteria" @click="currentValue = ''">
|
||||
<b-input-group-text class="pointer">
|
||||
|
||||
@ -217,5 +217,6 @@
|
||||
},
|
||||
"user_deleted": "Nutzer ist gelöscht.",
|
||||
"user_recovered": "Nutzer ist wiederhergestellt.",
|
||||
"user_search": "Nutzer-Suche"
|
||||
"user_search": "Nutzer-Suche",
|
||||
"user_memo_search": "Nutzer-Kommentar-Suche"
|
||||
}
|
||||
|
||||
@ -217,5 +217,6 @@
|
||||
},
|
||||
"user_deleted": "User is deleted.",
|
||||
"user_recovered": "User is recovered.",
|
||||
"user_search": "User search"
|
||||
"user_search": "User search",
|
||||
"user_memo_search": "User and Memo search"
|
||||
}
|
||||
|
||||
@ -33,8 +33,8 @@ export const findContributions = async (
|
||||
...(statusFilter?.length && { contributionStatus: In(statusFilter) }),
|
||||
...(userId && { userId }),
|
||||
}
|
||||
|
||||
const where =
|
||||
|
||||
let where =
|
||||
query && relations?.user
|
||||
? [
|
||||
{
|
||||
@ -57,8 +57,16 @@ export const findContributions = async (
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
...requiredWhere,
|
||||
memo: Like(`%${query}%`)
|
||||
},
|
||||
]
|
||||
: requiredWhere
|
||||
|
||||
if (!relations?.user && query) {
|
||||
where = [{...requiredWhere, memo: Like(`%${query}%`)}]
|
||||
}
|
||||
|
||||
return DbContribution.findAndCount({
|
||||
relations,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user