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

Merge pull request #1374 from gradido/1372-not-activated-email-not-be-selectable-for-multiple-creation

Browse Source 
if an email is not confirmed, a user cannot be added to any multiple …
This commit is contained in:
Alexander Friedland 2022-02-02 12:10:50 +01:00 committed by GitHub
commit 454125becb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
admin/src/components/UserTable.vue
View File

@ -125,15 +125,18 @@
</row-details> </row-details>
</template> </template>
<template #cell(bookmark)="row"> <template #cell(bookmark)="row">
<b-button <div v-show="type === 'UserListSearch'">
variant="warning" <b-button
v-show="type === 'UserListSearch'" v-if="row.item.emailChecked"
size="md" variant="warning"
@click="bookmarkPush(row.item)" size="md"
class="mr-2" @click="bookmarkPush(row.item)"
> class="mr-2"
<b-icon icon="plus" variant="success"></b-icon> >
</b-button> <b-icon icon="plus" variant="success"></b-icon>
</b-button>
<div v-else>{{ $t('e_mail') }}!</div>
</div>
<b-button <b-button
variant="danger" variant="danger"
v-show="type === 'UserListMassCreation' || type === 'PageCreationConfirm'" v-show="type === 'UserListMassCreation' || type === 'PageCreationConfirm'"

2
admin/src/locales/en.json
View File

@ -19,7 +19,7 @@
"update_creation": "Creation update" "update_creation": "Creation update"
}, },
"details": "Details", "details": "Details",
"e_mail": "E-Mail", "e_mail": "E-mail",
"firstname": "Firstname", "firstname": "Firstname",
"gradido_admin_footer": "Gradido Academy Admin Console", "gradido_admin_footer": "Gradido Academy Admin Console",
"hide_details": "Hide details from", "hide_details": "Hide details from",