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

add in backend deletedAt in UserAdmin.ts and AdminResolver.ts and in AdminFrontend add deletedAt in searchUser.js

Browse Source
This commit is contained in:
ogerly 2022-02-18 12:06:18 +01:00
parent 9e6c8e9e76
commit 3bd9e66079
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/components/DeletedUserFormular.vue
View File

@ -17,7 +17,7 @@ export default {
name: 'DeletedUser', name: 'DeletedUser',
props: { props: {
item: { item: {
type: Array, type: Object,
}, },
}, },
data() { data() {

1
admin/src/graphql/searchUsers.js
View File

@ -18,6 +18,7 @@ export const searchUsers = gql`
emailChecked emailChecked
hasElopage hasElopage
emailConfirmationSend emailConfirmationSend
deletedAt
} }
} }
} }

3
backend/src/graphql/model/UserAdmin.ts
View File

@ -23,6 +23,9 @@ export class UserAdmin {
@Field(() => Boolean) @Field(() => Boolean)
hasElopage: boolean hasElopage: boolean
@Field(() => Date, { nullable: true })
deletedAt?: Date | null
@Field(() => String, { nullable: true }) @Field(() => String, { nullable: true })
emailConfirmationSend?: string emailConfirmationSend?: string
} }

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

@ -46,6 +46,7 @@ export class AdminResolver {
adminUser.creation = await getUserCreations(user.id) adminUser.creation = await getUserCreations(user.id)
adminUser.emailChecked = user.emailChecked adminUser.emailChecked = user.emailChecked
adminUser.hasElopage = await hasElopageBuys(user.email) adminUser.hasElopage = await hasElopageBuys(user.email)
adminUser.deletedAt = user.deletedAt
if (!user.emailChecked) { if (!user.emailChecked) {
const emailOptIn = await LoginEmailOptIn.findOne( const emailOptIn = await LoginEmailOptIn.findOne(
{ {