Compare commits

..

No commits in common. "4bf425e1ca430399075ff690718734cd6a5b6bfd" and "a2f4fd5d9b4a683d5eeb5133009e14227f8ee54c" have entirely different histories.

View File

@ -62,7 +62,7 @@ export class UserController {
} }
user = await this.userRepository.save(user) user = await this.userRepository.save(user)
return new ResponseUser(await this.userRepository.findOne({ id: user.id }, { relations: ['permissions', 'groups', 'groups.permissions'] })); return new ResponseUser(await this.userRepository.findOne({ id: user.id }, { relations: ['permissions', 'groups'] }));
} }
@Put('/:id') @Put('/:id')
@ -83,7 +83,7 @@ export class UserController {
} }
await this.userRepository.save(await updateUser.update(oldUser)); await this.userRepository.save(await updateUser.update(oldUser));
return new ResponseUser(await this.userRepository.findOne({ id: id }, { relations: ['permissions', 'groups', 'groups.permissions'] })); return new ResponseUser(await this.userRepository.findOne({ id: id }, { relations: ['permissions', 'groups'] }));
} }
@Delete('/:id') @Delete('/:id')
@ -95,7 +95,7 @@ export class UserController {
async remove(@Param("id") id: number, @QueryParam("force") force: boolean) { async remove(@Param("id") id: number, @QueryParam("force") force: boolean) {
let user = await this.userRepository.findOne({ id: id }); let user = await this.userRepository.findOne({ id: id });
if (!user) { return null; } if (!user) { return null; }
const responseUser = await this.userRepository.findOne({ id: id }, { relations: ['permissions', 'groups', 'groups.permissions'] });; const responseUser = await this.userRepository.findOne({ id: id }, { relations: ['permissions', 'groups'] });;
const permissionControler = new PermissionController(); const permissionControler = new PermissionController();
for (let permission of responseUser.permissions) { for (let permission of responseUser.permissions) {