From 0a7f2231b0fa3886498167eb041ccae162d35b1f Mon Sep 17 00:00:00 2001
From: Hamza HRAMCHI <hamza.hramchi@xelians.fr>
Date: Tue, 23 Nov 2021 15:57:00 +0100
Subject: [PATCH] FIX #18721 TIME 0:25 indexing model changed : set values if
field is empty
---
.../indexing-form/indexing-form.component.ts | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
index f5778eb60b4..7f4ecca8857 100755
--- a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
+++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
@@ -262,6 +262,8 @@ export class IndexingFormComponent implements OnInit {
mustFixErrors: boolean = false;
+ isPrivate: boolean = false;
+
constructor(
public translate: TranslateService,
public http: HttpClient,
@@ -813,12 +815,11 @@ export class IndexingFormComponent implements OnInit {
}
if (elem.type === 'date') {
- if (!this.functions.empty(fieldValue) || elem.default_value !== null) {
- fieldValue = elem.default_value !== null ? elem.default_value : fieldValue;
- fieldValue = new Date(fieldValue);
- } else {
+ if (!this.isPrivate && this.functions.empty(fieldValue)) {
elem.default_value = null;
this.arrFormControl[elem.identifier].value = null;
+ } else if (!this.functions.empty(fieldValue)) {
+ fieldValue = new Date(fieldValue);
}
}
if (!this.functions.empty(fieldValue)) {
@@ -899,6 +900,7 @@ export class IndexingFormComponent implements OnInit {
this.http.get(`../rest/indexingModels/${indexModelId}`).pipe(
tap(async (data: any) => {
+ this.isPrivate = data.indexingModel.private || data.indexingModel.master !== null;
this.indexingFormId = data.indexingModel.master !== null ? data.indexingModel.master : data.indexingModel.id;
this.currentCategory = data.indexingModel.category;
this.mandatoryFile = data.indexingModel.mandatoryFile;
--
GitLab