IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not show unactivated emails in masscreation list

Browse Source
This commit is contained in:
Ulf Gebhardt 2022-03-25 13:35:33 +01:00
parent 94d0589cb9
commit 58eacb85ce
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/pages/Creation.vue
View File

@ -102,6 +102,8 @@ export default {
searchText: this.criteria, searchText: this.criteria,
currentPage: this.currentPage, currentPage: this.currentPage,
pageSize: this.perPage, pageSize: this.perPage,
notActivated: false,
isDeleted: false,
}, },
fetchPolicy: 'network-only', fetchPolicy: 'network-only',
}) })

12
admin/src/pages/UserSearch.vue
View File

@ -3,11 +3,11 @@
<div class="user-search-first-div"> <div class="user-search-first-div">
<b-button class="unconfirmedRegisterMails" variant="light" @click="unconfirmedRegisterMails"> <b-button class="unconfirmedRegisterMails" variant="light" @click="unconfirmedRegisterMails">
<b-icon icon="envelope" variant="danger"></b-icon> <b-icon icon="envelope" variant="danger"></b-icon>
{{ filterCheckedEmails ? $t('all_emails') : $t('unregistered_emails') }} {{ filterCheckedEmails ? $t('unregistered_emails') : $t('all_emails')}}
</b-button> </b-button>
<b-button class="deletedUserSearch" variant="light" @click="deletedUserSearch"> <b-button class="deletedUserSearch" variant="light" @click="deletedUserSearch">
<b-icon icon="x-circle" variant="danger"></b-icon> <b-icon icon="x-circle" variant="danger"></b-icon>
{{ filterDeletedUser ? $t('all_emails') : $t('deleted_user') }} {{ filterDeletedUser ? $t('deleted_user') : $t('all_emails') }}
</b-button> </b-button>
</div> </div>
<label>{{ $t('user_search') }}</label> <label>{{ $t('user_search') }}</label>
@ -60,8 +60,8 @@ export default {
searchResult: [], searchResult: [],
massCreation: [], massCreation: [],
criteria: '', criteria: '',
filterCheckedEmails: false, filterCheckedEmails: null,
filterDeletedUser: false, filterDeletedUser: null,
rows: 0, rows: 0,
currentPage: 1, currentPage: 1,
perPage: 25, perPage: 25,
@ -70,11 +70,11 @@ export default {
}, },
methods: { methods: {
unconfirmedRegisterMails() { unconfirmedRegisterMails() {
this.filterCheckedEmails = !this.filterCheckedEmails this.filterCheckedEmails = this.filterCheckedEmails ? null : true
this.getUsers() this.getUsers()
}, },
deletedUserSearch() { deletedUserSearch() {
this.filterDeletedUser = !this.filterDeletedUser this.filterDeletedUser = this.filterDeletedUser ? null : true
this.getUsers() this.getUsers()
}, },
getUsers() { getUsers() {

12
backend/src/graphql/resolver/AdminResolver.ts
View File

@ -50,19 +50,19 @@ export class AdminResolver {
searchText, searchText,
currentPage = 1, currentPage = 1,
pageSize = 25, pageSize = 25,
notActivated = false, notActivated = null,
isDeleted = false, isDeleted = null,
}: SearchUsersArgs, }: SearchUsersArgs,
): Promise<SearchUsersResult> { ): Promise<SearchUsersResult> {
const userRepository = getCustomRepository(UserRepository) const userRepository = getCustomRepository(UserRepository)
const filterCriteria: ObjectLiteral[] = [] const filterCriteria: ObjectLiteral[] = []
if (notActivated) { if (notActivated !== null) {
filterCriteria.push({ emailChecked: false }) filterCriteria.push({ emailChecked: notActivated })
} }
if (isDeleted) { if (isDeleted !== null) {
filterCriteria.push({ deletedAt: Not(IsNull()) }) filterCriteria.push({ deletedAt: isDeleted ? Not(IsNull()) : IsNull() })
} }
const userFields = ['id', 'firstName', 'lastName', 'email', 'emailChecked', 'deletedAt'] const userFields = ['id', 'firstName', 'lastName', 'email', 'emailChecked', 'deletedAt']