MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring

This commit is contained in:
Efstratios Giannopoulos 2024-05-28 15:09:23 +03:00
parent 20c2873dab 063f6aaf77
commit 04146f64f1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dmp-frontend/src/app/ui/admin/description-template/editor/components/section-fieldset/description-template-editor-section-fieldset.component.html
View File

@ -56,9 +56,10 @@
[ngClass]="{'field-container-active': fieldset.get('id').value === selectedFieldSetId}">
<mat-card-content>
<mat-card-header *ngIf="(fieldset.get('id').value === selectedFieldSetId) && !viewOnly">
<!-- <mat-card-header *ngIf="(fieldset.get('id').value === selectedFieldSetId) && !viewOnly"> -->
<mat-card-header *ngIf="!viewOnly">
<mat-icon *ngIf="reorderingMode" class="handle dragpan enabled-dragpan">drag_indicator</mat-icon>
<button mat-icon-button class="ml-auto mr-auto" *ngIf="!reorderingMode" (click)="enableReordering()">
<button mat-icon-button class="ml-auto mr-auto" *ngIf="!reorderingMode && (fieldset.get('id').value === selectedFieldSetId)" (click)="enableReordering()">
<mat-icon class="handle dragpan">drag_indicator</mat-icon>
</button>
</mat-card-header>

5
dmp-frontend/src/app/ui/admin/description-template/editor/components/section-fieldset/description-template-editor-section-fieldset.component.ts
View File

@ -53,7 +53,7 @@ export class DescriptionTemplateEditorSectionFieldSetComponent implements OnInit
this.dragulaService.createGroup(this.FIELDSETS, {
moves: (el, container, handle) => {
// if(this.viewOnly) return false; //uncomment if want to unable drag n drop in viewonly mode
if (el.id != (this.dragula_prefix + this.tocentry.id)) return false;
// if (el.id != (this.dragula_prefix + this.tocentry.id)) return false;
if (handle.className && handle.classList.contains('handle')) return true;
return false;
}
@ -67,13 +67,14 @@ export class DescriptionTemplateEditorSectionFieldSetComponent implements OnInit
// obs.
this.dataNeedsRefresh.emit();
return;
}));
this.subs.add(this.dragulaService.dragend(this.FIELDSETS).subscribe(({ el }) => {
this.exitReordering();
}))
}));
const initializerSub = this.initializer
.pipe(