Skip to content
Snippets Groups Projects
Commit 94f43b8e authored by NOUMANE's avatar NOUMANE Committed by pybelecalo
Browse files

[US TRTL-661] fix Modification of the user group

parent 7631ea15
No related branches found
No related tags found
10 merge requests!51Merge mis a jour vitam-ui,!25Nouveau mis a jour Vitamui,!24Nouveau mis a jour Vitamui,!23Nouveau mis a jour Vitamui,!22WIP: nouveau mis a jour Vitamui,!21nouveau mis a jour Vitamui,!20nouveau mis à jour Vitamui,!19nouveau mis à jour Vitamui,!18New MAJ Vitamui,!16[VAS] BUG 7332 : Correction sur la position de la barre permettant de...
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="mt-3 content"> <div class="mt-3 content">
<div> <div>
<app-group-list [groups] = "activeGroups" (selectedGroupEvent)="updateGroup($event)"></app-group-list> <app-group-list [groups] = "activeGroups" (selectedGroupEvent)="updateGroup($event)" [userGroupName] = "userGroupName"></app-group-list>
</div> </div>
<div class="actions"> <div class="actions">
<button type="button" class="btn primary" (click)="saveUserUpdate()" [disabled]="!selectedGroupName" i18n="group attribution edit@@groupAttributionEdit">Modifier</button> <button type="button" class="btn primary" (click)="saveUserUpdate()" [disabled]="!selectedGroupName" i18n="group attribution edit@@groupAttributionEdit">Modifier</button>
......
...@@ -62,6 +62,7 @@ export class GroupAttributionComponent implements OnInit { ...@@ -62,6 +62,7 @@ export class GroupAttributionComponent implements OnInit {
activeGroups: GroupSelection[]; activeGroups: GroupSelection[];
selectedGroupName: string; selectedGroupName: string;
CUSTOMER_ACTIVE_PROFILE_GROUPS_INDEX = 2; CUSTOMER_ACTIVE_PROFILE_GROUPS_INDEX = 2;
userGroupName: string;
public stepIndex = 0; public stepIndex = 0;
public stepCount = 1; public stepCount = 1;
...@@ -78,6 +79,7 @@ export class GroupAttributionComponent implements OnInit { ...@@ -78,6 +79,7 @@ export class GroupAttributionComponent implements OnInit {
public ngOnInit(): void { public ngOnInit(): void {
this.user = this.data[0]; this.user = this.data[0];
this.userGroupName = this.data[1].name;
this.resetActiveGroups(); this.resetActiveGroups();
} }
......
...@@ -39,7 +39,6 @@ import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular ...@@ -39,7 +39,6 @@ import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular
import { MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MAT_DIALOG_DATA } from '@angular/material/dialog';
import { collapseAnimation, rotateAnimation } from 'ui-frontend-common'; import { collapseAnimation, rotateAnimation } from 'ui-frontend-common';
import { GroupSelection } from './../../group-selection.interface'; import { GroupSelection } from './../../group-selection.interface';
@Component({ @Component({
selector: 'app-group-list', selector: 'app-group-list',
templateUrl: './group-list.component.html', templateUrl: './group-list.component.html',
...@@ -60,6 +59,11 @@ export class GroupListComponent implements OnInit { ...@@ -60,6 +59,11 @@ export class GroupListComponent implements OnInit {
@Input() @Input()
public searchActiv = false; public searchActiv = false;
@Input()
public set userGroupName(val: string) {
this.groupName = val;
}
@Output() @Output()
public selectedGroupEvent = new EventEmitter<GroupSelection>(); public selectedGroupEvent = new EventEmitter<GroupSelection>();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment