From 614aaca02aeca6ece6a5e1fb47de5718ad02a584 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Thu, 27 Feb 2020 17:38:02 +0100
Subject: [PATCH] FEAT #12091 TIME 0:50 Remove users without privileges from
list templates admin
---
.../diffusionModel-administration.component.ts | 4 ++--
src/frontend/app/avis/avis-workflow.component.ts | 12 ++++--------
src/frontend/app/visa/visa-workflow.component.scss | 2 +-
src/frontend/app/visa/visa-workflow.component.ts | 6 +-----
4 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/src/frontend/app/administration/diffusionModel/diffusionModel-administration.component.ts b/src/frontend/app/administration/diffusionModel/diffusionModel-administration.component.ts
index 2ab98c0912d..9d0a3ddaa6e 100755
--- a/src/frontend/app/administration/diffusionModel/diffusionModel-administration.component.ts
+++ b/src/frontend/app/administration/diffusionModel/diffusionModel-administration.component.ts
@@ -108,7 +108,7 @@ export class DiffusionModelAdministrationComponent implements OnInit {
const item = {
id: this.diffusionModel.id,
type: 'entity'
- }
+ };
setTimeout(async () => {
this.appVisaWorkflow.resetWorkflow();
@@ -122,7 +122,7 @@ export class DiffusionModelAdministrationComponent implements OnInit {
const item = {
id: this.diffusionModel.id,
type: 'entity'
- }
+ };
setTimeout(async () => {
this.appAvisWorkflow.resetWorkflow();
await this.appAvisWorkflow.addItemToWorkflow(item);
diff --git a/src/frontend/app/avis/avis-workflow.component.ts b/src/frontend/app/avis/avis-workflow.component.ts
index 4ed7b31407d..0d50a4f258a 100644
--- a/src/frontend/app/avis/avis-workflow.component.ts
+++ b/src/frontend/app/avis/avis-workflow.component.ts
@@ -4,7 +4,7 @@ import { LANG } from '../translate.component';
import { NotificationService } from '../notification.service';
import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
import { FunctionsService } from '../../service/functions.service';
-import { tap, exhaustMap, map, startWith, catchError, finalize, filter, debounceTime, switchMap } from 'rxjs/operators';
+import { tap, exhaustMap, map, startWith, catchError, finalize, filter } from 'rxjs/operators';
import { FormControl } from '@angular/forms';
import { LatinisePipe } from 'ngx-pipes';
import { Observable, of } from 'rxjs';
@@ -317,7 +317,7 @@ export class AvisWorkflowComponent implements OnInit {
difflist_type: 'entity_id'
});
});
- this.avisWorkflowClone = JSON.parse(JSON.stringify(this.avisWorkflow.items))
+ this.avisWorkflowClone = JSON.parse(JSON.stringify(this.avisWorkflow.items));
this.loading = false;
resolve(true);
}, (err: any) => {
@@ -458,7 +458,7 @@ export class AvisWorkflowComponent implements OnInit {
this.http.get(`../../rest/listTemplates/${item.id}`).pipe(
tap((data: any) => {
this.avisWorkflow.items = this.avisWorkflow.items.concat(
- data.listTemplate.items.map((itemTemplate: any) => {
+ data.listTemplate.items.filter((itemTemplate: any) => itemTemplate.hasPrivilege === true).map((itemTemplate: any) => {
return {
item_id: itemTemplate.item_id,
item_type: 'user',
@@ -483,11 +483,7 @@ export class AvisWorkflowComponent implements OnInit {
}
emptyWorkflow() {
- if (this.avisWorkflow.items.length === 0) {
- return true;
- } else {
- return false;
- }
+ return this.avisWorkflow.items.length === 0;
}
workflowEnd() {
diff --git a/src/frontend/app/visa/visa-workflow.component.scss b/src/frontend/app/visa/visa-workflow.component.scss
index 84ae8441a86..a62b4f80983 100644
--- a/src/frontend/app/visa/visa-workflow.component.scss
+++ b/src/frontend/app/visa/visa-workflow.component.scss
@@ -162,4 +162,4 @@
.comment:disabled {
color: black;
-}
\ No newline at end of file
+}
diff --git a/src/frontend/app/visa/visa-workflow.component.ts b/src/frontend/app/visa/visa-workflow.component.ts
index 588e8424f23..468b721264e 100644
--- a/src/frontend/app/visa/visa-workflow.component.ts
+++ b/src/frontend/app/visa/visa-workflow.component.ts
@@ -4,7 +4,7 @@ import { LANG } from '../translate.component';
import { NotificationService } from '../notification.service';
import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
import { FunctionsService } from '../../service/functions.service';
-import { tap, exhaustMap, map, startWith, catchError, finalize, filter, debounceTime, switchMap } from 'rxjs/operators';
+import { tap, exhaustMap, map, startWith, catchError, finalize, filter } from 'rxjs/operators';
import { FormControl } from '@angular/forms';
import { LatinisePipe } from 'ngx-pipes';
import { Observable, of } from 'rxjs';
@@ -12,8 +12,6 @@ import { MatDialog } from '@angular/material';
import { AddVisaModelModalComponent } from './addVisaModel/add-visa-model-modal.component';
import { ConfirmComponent } from '../../plugins/modal/confirm.component';
-declare function $j(selector: any): any;
-
@Component({
selector: 'app-visa-workflow',
templateUrl: 'visa-workflow.component.html',
@@ -107,8 +105,6 @@ export class VisaWorkflowComponent implements OnInit {
resolve(true);
});
});
-
-
}
loadVisaSignUsersList() {
--
GitLab