Skip to content
Snippets Groups Projects
Verified Commit 72a1e4b8 authored by Alex ORLUC's avatar Alex ORLUC
Browse files

fix some issues

parent 88fee25f
No related branches found
No related tags found
No related merge requests found
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
"connectionModeUpdated" : "Connection mode updated", "connectionModeUpdated" : "Connection mode updated",
"changeConnectionWarn" : "This cause a change in login mechanics for users !", "changeConnectionWarn" : "This cause a change in login mechanics for users !",
"uri" : "IP / Alias", "uri" : "IP / Alias",
"baseDN" : "DN base", "baseDN" : "DN base (required for open ldap)",
"prefix" : "Connection prefix", "prefix" : "Connection prefix",
"suffix" : "Connection suffix", "suffix" : "Connection suffix",
"connectionTest" : "Test connection", "connectionTest" : "Test connection",
...@@ -237,6 +237,8 @@ ...@@ -237,6 +237,8 @@
"beginSendTest" : "Begin send test", "beginSendTest" : "Begin send test",
"emailSendFailed" : "Email send failed", "emailSendFailed" : "Email send failed",
"emailSendInProgress" : "Email send in progress", "emailSendInProgress" : "Email send in progress",
"emailSendSuccess" : "Email send success" "emailSendSuccess" : "Email send success",
"manage_groupsAlt" : "Group(s)",
"groupCreation" : "Add a group"
} }
} }
...@@ -207,9 +207,9 @@ ...@@ -207,9 +207,9 @@
"connectionModeUpdated" : "Mode de connexion mise à jour", "connectionModeUpdated" : "Mode de connexion mise à jour",
"changeConnectionWarn" : "Cela entraine un changement de mécanique de connexion à l'application !", "changeConnectionWarn" : "Cela entraine un changement de mécanique de connexion à l'application !",
"uri" : "IP / Alias", "uri" : "IP / Alias",
"baseDN" : "Base DN", "baseDN" : "Base DN (obligatoire pour open ldap)",
"prefix" : "Prefix de connexion", "prefix" : "Préfixe de connexion",
"suffix" : "Suffix de connexion", "suffix" : "Suffixe de connexion",
"connectionTest" : "Tester la connexion", "connectionTest" : "Tester la connexion",
"testAlt" : "Tester", "testAlt" : "Tester",
"connectionInProgress" : "Connexion en cours", "connectionInProgress" : "Connexion en cours",
...@@ -238,6 +238,9 @@ ...@@ -238,6 +238,9 @@
"beginSendTest" : "Commencer le test", "beginSendTest" : "Commencer le test",
"emailSendFailed" : "Échec d'envoi", "emailSendFailed" : "Échec d'envoi",
"emailSendInProgress" : "En cours d'envoi", "emailSendInProgress" : "En cours d'envoi",
"emailSendSuccess" : "Envoi réussi" "emailSendSuccess" : "Envoi réussi",
"manage_groupsAlt" : "Groupe(s)",
"groupCreation" : "Ajouter un groupe"
} }
} }
...@@ -33,16 +33,19 @@ ...@@ -33,16 +33,19 @@
</mat-form-field> </mat-form-field>
<mat-form-field class="input-row"> <mat-form-field class="input-row">
<input name="dn" matInput placeholder="{{'lang.baseDN' | translate}}" [(ngModel)]="ldap.value.baseDN"> <input name="dn" matInput placeholder="{{'lang.baseDN' | translate}}" [(ngModel)]="ldap.value.baseDN">
<mat-hint> <mat-hint align="end">
ex: dc=maarch,dc=com ex: dc=maarch,dc=com
</mat-hint> </mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field class="input-row"> <mat-form-field class="input-row">
<input name="prefix" matInput placeholder="{{'lang.prefix' | translate}}" [(ngModel)]="ldap.value.prefix"> <input name="prefix" matInput placeholder="{{'lang.prefix' | translate}}" [(ngModel)]="ldap.value.prefix">
<mat-hint align="end">
ex: MAARCH
</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field class="input-row"> <mat-form-field class="input-row">
<input name="suffix" matInput placeholder="{{'lang.suffix' | translate}}" [(ngModel)]="ldap.value.suffix"> <input name="suffix" matInput placeholder="{{'lang.suffix' | translate}}" [(ngModel)]="ldap.value.suffix">
<mat-hint> <mat-hint align="end">
ex: @maarch.com ex: @maarch.com
</mat-hint> </mat-hint>
</mat-form-field> </mat-form-field>
......
import { Component, OnInit, Input } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { SignaturesContentService } from '../../../service/signatures.service'; import { SignaturesContentService } from '../../../service/signatures.service';
import { NotificationService } from '../../../service/notification.service'; import { NotificationService } from '../../../service/notification.service';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
...@@ -43,7 +43,7 @@ export class LdapComponent implements OnInit { ...@@ -43,7 +43,7 @@ export class LdapComponent implements OnInit {
title: string = ''; title: string = '';
// tslint:disable-next-line:no-input-rename // tslint:disable-next-line:no-input-rename
@Input('snavRight') snavRight: MatSidenav; @ViewChild('snavRight') snavRight: MatSidenav;
constructor(public http: HttpClient, private translate: TranslateService, private route: ActivatedRoute, private router: Router, public signaturesService: SignaturesContentService, public notificationService: NotificationService, public dialog: MatDialog) { constructor(public http: HttpClient, private translate: TranslateService, private route: ActivatedRoute, private router: Router, public signaturesService: SignaturesContentService, public notificationService: NotificationService, public dialog: MatDialog) {
} }
...@@ -168,10 +168,10 @@ export class LdapComponent implements OnInit { ...@@ -168,10 +168,10 @@ export class LdapComponent implements OnInit {
) )
.subscribe({ .subscribe({
next: (data: any) => { next: (data: any) => {
this.ldapTest.result = data.info; this.ldapTest.result = data.informations;
if (data.connection) { if (data.connection) {
this.snavRight.close(); this.snavRight.close();
this.notificationService.success('ldapConnectionSucceeded'); this.notificationService.success('lang.ldapConnectionSucceeded');
} }
}, },
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment