mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
Fix logic of filterByActivated
- Fix test with this.
This commit is contained in:
parent
0c0bfe1a10
commit
206737581f
@ -3,8 +3,13 @@
|
|||||||
<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>
|
||||||
<!-- Wolle: check logic -->
|
{{
|
||||||
{{ filterCheckedEmails ? $t('unregistered_emails') : $t('all_emails') }}
|
filterByActivated === null
|
||||||
|
? $t('all_emails')
|
||||||
|
: filterByActivated === false
|
||||||
|
? $t('unregistered_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>
|
||||||
@ -61,7 +66,7 @@ export default {
|
|||||||
searchResult: [],
|
searchResult: [],
|
||||||
massCreation: [],
|
massCreation: [],
|
||||||
criteria: '',
|
criteria: '',
|
||||||
filterCheckedEmails: null,
|
filterByActivated: null,
|
||||||
filterDeletedUser: null,
|
filterDeletedUser: null,
|
||||||
rows: 0,
|
rows: 0,
|
||||||
currentPage: 1,
|
currentPage: 1,
|
||||||
@ -71,7 +76,7 @@ export default {
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
unconfirmedRegisterMails() {
|
unconfirmedRegisterMails() {
|
||||||
this.filterCheckedEmails = this.filterCheckedEmails ? null : true
|
this.filterByActivated = this.filterByActivated === null ? false : null
|
||||||
this.getUsers()
|
this.getUsers()
|
||||||
},
|
},
|
||||||
deletedUserSearch() {
|
deletedUserSearch() {
|
||||||
@ -86,7 +91,7 @@ export default {
|
|||||||
searchText: this.criteria,
|
searchText: this.criteria,
|
||||||
currentPage: this.currentPage,
|
currentPage: this.currentPage,
|
||||||
pageSize: this.perPage,
|
pageSize: this.perPage,
|
||||||
filterByActivated: this.filterCheckedEmails, // Wolle: check logic
|
filterByActivated: this.filterByActivated,
|
||||||
filterByDeleted: this.filterDeletedUser,
|
filterByDeleted: this.filterDeletedUser,
|
||||||
},
|
},
|
||||||
fetchPolicy: 'no-cache',
|
fetchPolicy: 'no-cache',
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user