From c458c69684c2371a6d3c9c0e26b4760f92cbd104 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 5 Dec 2019 11:43:34 +0100
Subject: [PATCH] FIX #12331 TIME 0:10 fix remove file
---
.../attachments-page/attachment-page.component.html | 2 +-
.../attachments-page/attachment-page.component.scss | 2 ++
.../attachments-page/attachment-page.component.ts | 8 ++++----
src/frontend/app/viewer/document-viewer.component.ts | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/frontend/app/attachments/attachments-page/attachment-page.component.html b/src/frontend/app/attachments/attachments-page/attachment-page.component.html
index cc3995a5c01..4326ef9251e 100644
--- a/src/frontend/app/attachments/attachments-page/attachment-page.component.html
+++ b/src/frontend/app/attachments/attachments-page/attachment-page.component.html
@@ -197,7 +197,7 @@
<app-document-viewer #appAttachmentViewer style="height:100%;width:100%;" [editMode]="editMode"
[resId]="data.resId" [resIdMaster]="attachment['resIdMaster'].value" [mode]="'attachment'"
[attachType]="attachment['type'].value" [infoPanel]="snavLeft"
- (triggerEvent)="setDatasViewer()"
+ (triggerEvent)="setDatasViewer($event)"
[title]="attachment.chrono.value + ' - ' + attachment.title.value">
</app-document-viewer>
</mat-tab>
diff --git a/src/frontend/app/attachments/attachments-page/attachment-page.component.scss b/src/frontend/app/attachments/attachments-page/attachment-page.component.scss
index 77b6ff8dad3..e75c7c801cd 100644
--- a/src/frontend/app/attachments/attachments-page/attachment-page.component.scss
+++ b/src/frontend/app/attachments/attachments-page/attachment-page.component.scss
@@ -89,6 +89,8 @@
display: block;
height: 100% !important;
text-align: center;
+ background: $primary;
+ color: white;
}
}
diff --git a/src/frontend/app/attachments/attachments-page/attachment-page.component.ts b/src/frontend/app/attachments/attachments-page/attachment-page.component.ts
index c6f8d447c9e..cd4736b45b5 100644
--- a/src/frontend/app/attachments/attachments-page/attachment-page.component.ts
+++ b/src/frontend/app/attachments/attachments-page/attachment-page.component.ts
@@ -190,7 +190,7 @@ export class AttachmentPageComponent implements OnInit {
return attachmentValues;
}
- setDatasViewer() {
+ setDatasViewer(ev: any) {
let datas: any = {};
Object.keys(this.attachment).forEach(element => {
if (['title', 'validationDate', 'effectiveDate'].indexOf(element) > -1) {
@@ -200,9 +200,9 @@ export class AttachmentPageComponent implements OnInit {
datas['resId'] = this.attachment['resIdMaster'].value;
this.attachment.encodedFile.setValue(this.appAttachmentViewer.getFile().content);
this.appAttachmentViewer.setDatas(datas);
- console.log('event!');
-
- this.setNewVersion();
+ if (ev !== 'cleanFile') {
+ this.setNewVersion();
+ }
}
getAttachType(attachType: any) {
diff --git a/src/frontend/app/viewer/document-viewer.component.ts b/src/frontend/app/viewer/document-viewer.component.ts
index afc7ff1895a..336b7e23bfe 100644
--- a/src/frontend/app/viewer/document-viewer.component.ts
+++ b/src/frontend/app/viewer/document-viewer.component.ts
@@ -371,7 +371,7 @@ export class DocumentViewerComponent implements OnInit {
content: null,
src: null
};
- this.triggerEvent.emit();
+ this.triggerEvent.emit('cleanFile');
}),
catchError((err: any) => {
this.notify.handleErrors(err);
--
GitLab