From 9d5bb042dca996dba8666d50c8ae16f0494276b5 Mon Sep 17 00:00:00 2001
From: Vinciane <vinciane.bizet@maarch.org>
Date: Wed, 23 Jan 2019 17:29:38 +0100
Subject: [PATCH] FIX #9798 Drag and drop
---
.../administration/list/list-administration.component.html | 2 +-
.../app/administration/list/list-administration.component.ts | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/frontend/app/administration/list/list-administration.component.html b/src/frontend/app/administration/list/list-administration.component.html
index 40075344fcf..650fa67238c 100644
--- a/src/frontend/app/administration/list/list-administration.component.html
+++ b/src/frontend/app/administration/list/list-administration.component.html
@@ -45,7 +45,7 @@
</div>
<div class="col-md-6 active-data">
- <h2><span class="title">{{lang.chosenDatas}}</span> <i class="fa fa-eraser removeAllDatas" color="warn" title="{{lang.removeAllDatas}}" (click)="removeAllData()"></i></h2>
+ <h2><span class="title">{{lang.chosenDatas}}</span> <i class="fa fa-minus-circle removeAllDatas" color="warn" title="{{lang.removeAllDatas}}" (click)="removeAllData()"></i></h2>
<div cdkDropList #dataExportList="cdkDropList" [cdkDropListData]="exportModel.data"
[cdkDropListConnectedTo]="[dataAvailableList]" class="cdk-list" (cdkDropListDropped)="drop($event)">
<div class="columns" *ngFor="let item of exportModel.data;let i = index" cdkDrag>{{item.label}} <i
diff --git a/src/frontend/app/administration/list/list-administration.component.ts b/src/frontend/app/administration/list/list-administration.component.ts
index c19b83ca641..cb135c84c5a 100644
--- a/src/frontend/app/administration/list/list-administration.component.ts
+++ b/src/frontend/app/administration/list/list-administration.component.ts
@@ -251,11 +251,9 @@ export class ListAdministrationComponent implements OnInit {
if (event.previousContainer === event.container) {
moveItemInArray(event.container.data, event.previousIndex, event.currentIndex);
} else {
- const fakeIndex = $j('.available-data .columns')[event.previousIndex].id;
- const realIndex = this.dataAvailable.map((dataAv: any) => (dataAv.id)).indexOf(fakeIndex);
transferArrayItem(event.previousContainer.data,
event.container.data,
- realIndex,
+ event.previousIndex,
event.currentIndex);
this.listFilter.nativeElement.value = '';
}
--
GitLab