From 75c6aec14a3a7332f3e1a5f4a60e06ebfbdc42b1 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 27 Jun 2019 10:26:53 +0200
Subject: [PATCH] FIX #10771 TIME 0:20 fix link user
---
.../user/account-link/account-link.component.html | 2 +-
.../administration/user/account-link/account-link.component.ts | 3 ++-
.../app/administration/user/user-administration.component.html | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/frontend/app/administration/user/account-link/account-link.component.html b/src/frontend/app/administration/user/account-link/account-link.component.html
index 3f5a61d2d01..c28c0c2e381 100644
--- a/src/frontend/app/administration/user/account-link/account-link.component.html
+++ b/src/frontend/app/administration/user/account-link/account-link.component.html
@@ -26,6 +26,6 @@
<div *ngIf="!externalUser.inMaarchParapheur" class="alert-message alert-message-danger" role="alert" style="margin-top: 30px;" [innerHTML]="lang.maarchParapheurAccountMsg + ' <b>' + externalUser.login + '</b> ' + lang.maarchParapheurAccountMsg2"></div>
</mat-dialog-content>
<mat-dialog-actions>
- <button color="primary" mat-raised-button (click)="this.dialogRef.close(externalUser);">{{lang.validate}}</button>
+ <button color="primary" mat-raised-button (click)="this.dialogRef.close(externalUser);" [disabled]="externalUser.login === ''">{{lang.validate}}</button>
<button mat-raised-button (click)="this.dialogRef.close('');">{{lang.cancel}}</button>
</mat-dialog-actions>
\ No newline at end of file
diff --git a/src/frontend/app/administration/user/account-link/account-link.component.ts b/src/frontend/app/administration/user/account-link/account-link.component.ts
index 7b4befe9831..54ff6205fe8 100644
--- a/src/frontend/app/administration/user/account-link/account-link.component.ts
+++ b/src/frontend/app/administration/user/account-link/account-link.component.ts
@@ -28,7 +28,7 @@ export class AccountLinkComponent extends AutoCompletePlugin {
}
ngOnInit(): void {
- this.http.get(this.coreUrl + 'rest/autocomplete/maarchParapheurUsers', { params: { "search": this.data.user.lastname, "exludeAlreadyConnected": 'true' } })
+ this.http.get(this.coreUrl + 'rest/autocomplete/maarchParapheurUsers', { params: { "search": this.data.user.mail, "exludeAlreadyConnected": 'true' } })
.subscribe((dataUsers: any) => {
if ( dataUsers.length > 0) {
this.externalUser = dataUsers[0];
@@ -67,6 +67,7 @@ export class AccountLinkComponent extends AutoCompletePlugin {
unlinkMaarchParapheurAccount() {
this.externalUser.inMaarchParapheur = false;
this.externalUser = this.data.user;
+ this.externalUser.login = this.data.user.user_id;
this.externalUser.email = this.data.user.mail;
}
}
diff --git a/src/frontend/app/administration/user/user-administration.component.html b/src/frontend/app/administration/user/user-administration.component.html
index cdc1df34c4d..0a5f0d96899 100755
--- a/src/frontend/app/administration/user/user-administration.component.html
+++ b/src/frontend/app/administration/user/user-administration.component.html
@@ -30,7 +30,7 @@
{{lang.changePassword}}
</p>
</a>
- <a mat-list-item *ngIf="user.canCreateMaarchParapheurUser" (click)="linkMaarchParapheurAccount()"
+ <a mat-list-item *ngIf="user.canCreateMaarchParapheurUser || maarchParapheurLink.login === ''" (click)="linkMaarchParapheurAccount()"
title="{{lang.createUserInMaarchParapheur}}">
<mat-icon color="primary" mat-list-icon class="fa fa-link"></mat-icon>
<p mat-line>
--
GitLab