diff --git a/src/frontend/app/diffusions/diffusions-list.component.html b/src/frontend/app/diffusions/diffusions-list.component.html index ead2293f465edc63b82d5ea662982d99d0c7e9cc..b0a67c3b20f92cb5446a64807437664248d1859f 100644 --- a/src/frontend/app/diffusions/diffusions-list.component.html +++ b/src/frontend/app/diffusions/diffusions-list.component.html @@ -49,7 +49,7 @@ </div> <div *ngIf="role.id !== 'dest' && adminMode"> <button mat-icon-button color="warn" (click)="deleteItem(role.id,i)"> - <mat-icon class="fa fa-times" style="height:auto;"></mat-icon> + <mat-icon class="fa fa-trash" style="height:auto;"></mat-icon> </button> </div> </mat-list-item> diff --git a/src/frontend/app/diffusions/diffusions-list.component.ts b/src/frontend/app/diffusions/diffusions-list.component.ts index 80f839ef66a852bf3e0b5530cfad848613e75888..d2c628a3195dbfb4ec96c0f3b287096808a3acc6 100644 --- a/src/frontend/app/diffusions/diffusions-list.component.ts +++ b/src/frontend/app/diffusions/diffusions-list.component.ts @@ -58,8 +58,8 @@ export class DiffusionsListComponent implements OnInit { /** * To load privilege of current list management - * @param indexing - * @param process + * @param indexation + * @param details * @param redirect */ @Input('target') target: string; @@ -82,7 +82,7 @@ export class DiffusionsListComponent implements OnInit { ) { } ngOnInit(): void { - this.target = this.target !== undefined ? this.target : 'indexing'; + this.target = this.target !== undefined ? this.target : ''; this.adminMode = this.adminMode !== undefined ? this.adminMode : false; this.keepDestForRedirection = this.keepDestForRedirection !== undefined ? this.keepDestForRedirection : false; @@ -125,7 +125,7 @@ export class DiffusionsListComponent implements OnInit { let mergedRoutesDatas: any = {}; if (this.availableRoles.length === 0) { - arrayRoutes.push(this.http.get('../../rest/listTemplates/types/entity_id/roles')); + arrayRoutes.push(this.http.get('../../rest/roles?context=' + this.target)); } arrayRoutes.push(this.http.get('../../rest/listTemplates/entities/' + entityId)); @@ -217,7 +217,7 @@ export class DiffusionsListComponent implements OnInit { let mergedRoutesDatas: any = {}; if (this.availableRoles.length === 0) { - arrayRoutes.push(this.http.get('../../rest/listTemplates/types/entity_id/roles')); + arrayRoutes.push(this.http.get('../../rest/roles?context=' + this.target)); } arrayRoutes.push(this.http.get('../../rest/resources/' + resId + '/listInstance')); @@ -277,7 +277,7 @@ export class DiffusionsListComponent implements OnInit { } initRoles() { - this.http.get('../../rest/listTemplates/types/entity_id/roles').pipe( + this.http.get('../../rest/roles?context=' + this.target).pipe( tap(() => { this.availableRoles.forEach(element => { this.diffList[element.id] = { diff --git a/src/frontend/app/indexation/indexing-form/indexing-form.component.html b/src/frontend/app/indexation/indexing-form/indexing-form.component.html index 246e72d41bf7edf410d7c7b1134396f02d4cace7..d46134e1e459c081d22c155b119cf24498b870dc 100644 --- a/src/frontend/app/indexation/indexing-form/indexing-form.component.html +++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.html @@ -181,7 +181,7 @@ *ngIf="!adminMode && arrFormControl['diffusionList'].valid && !isEmptyField(field)"></i> </div> </div> - <app-diffusions-list #appDiffusionsList [entityId]="arrFormControl[field.identifier].value" [diffFormControl]="arrFormControl['diffusionList']" [allowedEntities]="field.allowedEntities" (triggerEvent)="changeDestination($event,field.allowedEntities)"> + <app-diffusions-list #appDiffusionsList [entityId]="arrFormControl[field.identifier].value" [diffFormControl]="arrFormControl['diffusionList']" [allowedEntities]="field.allowedEntities" [target]="'indexation'" (triggerEvent)="changeDestination($event,field.allowedEntities)"> </app-diffusions-list> <mat-divider></mat-divider> </div>