From 995c2e2111d5c49f278fc3cf1ee7b409fa5f08a0 Mon Sep 17 00:00:00 2001
From: Alex Orluc <alex.orluc@maarch.org>
Date: Thu, 15 Mar 2018 18:27:59 +0100
Subject: [PATCH] FIX 141 fix display modal button
---
.../Views/users-administration-redirect-modal.component.html | 2 +-
.../app/administration/users-administration.component.ts | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/apps/maarch_entreprise/Views/users-administration-redirect-modal.component.html b/apps/maarch_entreprise/Views/users-administration-redirect-modal.component.html
index 2ee29768c75..2bd328ca218 100644
--- a/apps/maarch_entreprise/Views/users-administration-redirect-modal.component.html
+++ b/apps/maarch_entreprise/Views/users-administration-redirect-modal.component.html
@@ -32,7 +32,7 @@
</div>
<mat-dialog-actions>
<button mat-raised-button color="warn" *ngIf="data.userDestRedirect.mode == 'del'" type="submit" class="btn btn-danger" (click)="dialogRef.close(this.data.userDestRedirectModels)"
- [disabled]="!changeDiffListDestForm.form.valid">{{lang.delete}} {{lang.user}}</button>
+ [disabled]="!sendFunction()">{{lang.delete}} {{lang.user}}</button>
<button mat-raised-button color="primary" *ngIf="data.userDestRedirect.mode == 'up'" type="submit" (click)="dialogRef.close(this.data.userDestRedirectModels)"
[disabled]="!sendFunction()">{{lang.suspend}} {{lang.user}}</button>
</mat-dialog-actions>
diff --git a/apps/maarch_entreprise/js/angular/app/administration/users-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/users-administration.component.ts
index d3c58910f48..86d4fefc481 100644
--- a/apps/maarch_entreprise/js/angular/app/administration/users-administration.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/users-administration.component.ts
@@ -81,6 +81,7 @@ export class UsersAdministrationComponent extends AutoCompletePlugin implements
suspendUser(user: any) {
if (user.inDiffListDest == 'Y') {
+ user.mode = 'up';
this.userDestRedirect = user;
this.http.get(this.coreUrl + 'rest/listTemplates/entityDest/itemId/' + user.user_id)
.subscribe((data: any) => {
@@ -168,6 +169,7 @@ export class UsersAdministrationComponent extends AutoCompletePlugin implements
deleteUser(user: any) {
if (user.inDiffListDest == 'Y') {
+ user.mode = 'del';
this.userDestRedirect = user;
this.http.get(this.coreUrl + 'rest/listTemplates/entityDest/itemId/' + user.user_id)
.subscribe((data: any) => {
--
GitLab