From 9d81b80a95c7844864f77bb4d7936fde9f9d7316 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Fri, 8 Nov 2019 18:02:36 +0100
Subject: [PATCH] FEAT #12003 TIME 0 fix priv
---
.../group/group-administration.component.html | 12 ++++++------
.../group/group-administration.component.ts | 6 ++----
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/frontend/app/administration/group/group-administration.component.html b/src/frontend/app/administration/group/group-administration.component.html
index 7e584502a6d..0d749f5c99c 100755
--- a/src/frontend/app/administration/group/group-administration.component.html
+++ b/src/frontend/app/administration/group/group-administration.component.html
@@ -95,26 +95,26 @@
<ng-template #elseTemplate>
<mat-list-item *ngFor="let fakePrivilege of unit.services" color="primary"
style="font-size: 16px;">
- {{fakePrivilege.label}}
+ <span [innerHTML]="fakePrivilege.label"></span>
<mat-form-field
style="width: 250px !important;padding-left: 10px;padding-right: 10px;">
- <mat-select [(ngModel)]="fakePrivilege.current" (selectionChange)="changeDifflistPrivilege($event, fakePrivilege.id)">
+ <mat-select [(ngModel)]="fakePrivilege.current"
+ (selectionChange)="changeDifflistPrivilege($event, fakePrivilege.id)">
<mat-option value="">{{lang.noRole}}</mat-option>
<mat-option *ngFor="let subservice of fakePrivilege.services"
[value]="subservice.id">{{subservice.label}}</mat-option>
</mat-select>
- </mat-form-field> {{fakePrivilege.label2}}
+ </mat-form-field>.
</mat-list-item>
</ng-template>
-
-
</mat-expansion-panel>
</mat-tab>
</mat-tab-group>
</mat-tab>
<mat-tab label="{{lang.indexation}}" *ngIf="!creationMode">
<ng-template matTabContent>
- <app-indexing-administration [groupId]="group.id" (resfreshShortcut)="resfreshShortcut()"></app-indexing-administration>
+ <app-indexing-administration [groupId]="group.id" (resfreshShortcut)="resfreshShortcut()">
+ </app-indexing-administration>
</ng-template>
</mat-tab>
<mat-tab label="{{lang.relatedUsers}}" *ngIf="!creationMode">
diff --git a/src/frontend/app/administration/group/group-administration.component.ts b/src/frontend/app/administration/group/group-administration.component.ts
index 039716979dd..d9f4f040bd6 100755
--- a/src/frontend/app/administration/group/group-administration.component.ts
+++ b/src/frontend/app/administration/group/group-administration.component.ts
@@ -99,15 +99,13 @@ export class GroupAdministrationComponent implements OnInit {
services = [
{
"id": "indexing_diffList",
- "label": this.lang.diffListPrivilegeMsg,
- "label2": this.lang.diffListPrivilegeMsgIndexing,
+ "label": this.lang.diffListPrivilegeMsgIndexing,
"current": this.group.privileges.filter((priv: any) => ['update_diffusion_indexing', 'update_diffusion_except_recipient_indexing'].indexOf(priv) > -1)[0] !== undefined ? this.group.privileges.filter((priv: any) => ['update_diffusion_indexing', 'update_diffusion_except_recipient_indexing'].indexOf(priv) > -1)[0] : '',
"services": this.privilegeService.getPrivileges(['update_diffusion_indexing', 'update_diffusion_except_recipient_indexing'])
},
{
"id": "process_diffList",
- "label": this.lang.diffListPrivilegeMsg,
- "label2": this.lang.diffListPrivilegeMsgProcess,
+ "label": this.lang.diffListPrivilegeMsgProcess,
"current": this.group.privileges.filter((priv: any) => ['update_diffusion_details', 'update_diffusion_except_recipient_details'].indexOf(priv) > -1)[0] !== undefined ? this.group.privileges.filter((priv: any) => ['update_diffusion_details', 'update_diffusion_except_recipient_details'].indexOf(priv) > -1)[0] : '',
"services": this.privilegeService.getPrivileges(['update_diffusion_details', 'update_diffusion_except_recipient_details'])
}
--
GitLab