From 7937bcf2475aed70f1fc1f43704381ce8b41b516 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Tue, 4 Aug 2020 15:00:03 +0200
Subject: [PATCH] FEAT #10568 TIME 1:00 fix rest user in autocomplete in group
admin
---
.../administration/group/group-administration.component.html | 2 +-
.../administration/group/group-administration.component.ts | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/frontend/app/administration/group/group-administration.component.html b/src/frontend/app/administration/group/group-administration.component.html
index 61a8db60300..600e393f3b3 100755
--- a/src/frontend/app/administration/group/group-administration.component.html
+++ b/src/frontend/app/administration/group/group-administration.component.html
@@ -153,7 +153,7 @@
<div class="row" style="margin:0px;">
<div class="col-md-12" *ngIf="group.canAdminUsers" style="padding:5px;">
<plugin-autocomplete [labelPlaceholder]="lang.linkUser"
- [labelList]="lang.availableUsers" [routeDatas]="['/rest/autocomplete/users']"
+ [labelList]="lang.availableUsers" [routeDatas]="['/rest/autocomplete/users/administration']"
[targetSearchKey]="'idToDisplay'" [subInfoKey]="'id'"
(triggerEvent)="linkUser($event)"></plugin-autocomplete>
<hr />
diff --git a/src/frontend/app/administration/group/group-administration.component.ts b/src/frontend/app/administration/group/group-administration.component.ts
index 63aeb2d67f8..e4d69ea4081 100755
--- a/src/frontend/app/administration/group/group-administration.component.ts
+++ b/src/frontend/app/administration/group/group-administration.component.ts
@@ -354,14 +354,15 @@ export class GroupAdministrationComponent implements OnInit {
'groupId': this.group.group_id,
'role': this.group.role
};
- this.http.post('../rest/users/' + newUser.serialId + '/groups', groupReq)
+ this.http.post('../rest/users/' + newUser.id + '/groups', groupReq)
.subscribe(() => {
const displayName = newUser.idToDisplay.split(' ');
const user = {
id: newUser.id,
user_id: newUser.otherInfo,
firstname: displayName[0],
- lastname: displayName[1]
+ lastname: displayName[1],
+ allowed: true
};
this.group.users.push(user);
this.usersDataSource = new MatTableDataSource(this.group.users);
--
GitLab