Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 08:58:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fixed: archiving user from personal workspace on all users page (#12578)

Browse source
This commit is contained in:
Muhsin Shah C P 2025-04-14 18:49:22 +05:30 committed by GitHub
parent 83b46e0922
commit 07f2e7137f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/ee

@ -1 +1 @@
Subproject commit 04839761243719f881c4a9ebbb052fc09ab6b967
Subproject commit 1e9ecf7ea675a48622726c79e3382258701e3c14

2
server/ee

@ -1 +1 @@
Subproject commit 2944154e1f74f87c0389e4b17287b36cc3616dbe
Subproject commit 1d1c2c05b112e12f01a219567973a70ddf2935cb

4
server/src/modules/organization-users/controller.ts
View file

@ -78,8 +78,8 @@ export class OrganizationUsersController implements IOrganizationUsersController
@InitFeature(FEATURE_KEY.USER_ARCHIVE)
@Post(':id/archive')
async archive(@User() user: UserEntity, @Param('id') id: string) {
const organizationId = user.organizationId;
async archive(@User() user: UserEntity, @Param('id') id: string, @Body() body) {
const organizationId = body.organizationId ? body.organizationId : user.organizationId;
await this.organizationUsersService.archive(id, organizationId, user);
return;
}

2
server/src/modules/organization-users/interfaces/IController.ts
View file

@ -7,7 +7,7 @@ export interface IOrganizationUsersController {
getUserSuggestions(user: User, searchInput: string): Promise<any>;
create(user: User, inviteNewUserDto: InviteNewUserDto): Promise<void>;
bulkUploadUsers(user: User, file: any, res: Response): Promise<void>;
archive(user: User, id: string): Promise<void>;
archive(user: User, id: string, body: any): Promise<void>;
archiveAll(user: User, userId: string): Promise<void>;
unarchiveAll(user: User, userId: string): Promise<void>;
updateUser(id: string, updateUserDto: UpdateOrgUserDto, user: User): Promise<void>;