From b9ebcbefa0fe2ee0fbaa183623b6b24a4d1d010b Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Fri, 18 Oct 2019 10:13:53 +0200
Subject: [PATCH] Fix new identifier
---
.gitignore | 1 +
.../indexation/indexing-form/indexing-form.component.html | 4 ++--
.../app/indexation/indexing-form/indexing-form.component.ts | 6 +++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index 1e98ca9c532..aefcb8ca38f 100755
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ modules/visa/xml/remoteSignatoryBooks.xml
dist/
node_modules/
package-lock.json
+custom/**/*.xml
diff --git a/src/frontend/app/indexation/indexing-form/indexing-form.component.html b/src/frontend/app/indexation/indexing-form/indexing-form.component.html
index 4252bbe9417..8ab55275924 100644
--- a/src/frontend/app/indexation/indexing-form/indexing-form.component.html
+++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.html
@@ -21,7 +21,7 @@
</div>
<div class="content">
<div cdkDropList id="indexingModelsCustomFieldsList_{{category}}"
- [cdkDropListConnectedTo]="['indexingModelsCustomFieldsList_mail','indexingModelsCustomFieldsList_contact','indexingModelsCustomFieldsList_process','indexingModelsCustomFieldsList_classement','customFieldsList','fieldsList']"
+ [cdkDropListConnectedTo]="['indexingModelsCustomFieldsList_mail','indexingModelsCustomFieldsList_contact','indexingModelsCustomFieldsList_process','indexingModelsCustomFieldsList_classifying','customFieldsList','fieldsList']"
[cdkDropListData]="this['indexingModels_'+category]" [cdkDropListDisabled]="!adminMode"
(cdkDropListDropped)="drop($event)" class="indexingModelsCustomFieldsList"
style="min-height: 50px;">
@@ -142,7 +142,7 @@
[manageDatas]="!adminMode ? field.values[1] : undefined" style="width:100%;">
</plugin-autocomplete>
</ng-container>-->
- <ng-container *ngIf="field.identifier === 'folder'">
+ <ng-container *ngIf="field.identifier === 'folders'">
<app-folder-input [control]="arrFormControl[field.identifier]" style="width:100%;">
</app-folder-input>
</ng-container>
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 663851d8dac..82155cda105 100644
--- a/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
+++ b/src/frontend/app/indexation/indexing-form/indexing-form.component.ts
@@ -326,7 +326,7 @@ export class IndexingFormComponent implements OnInit {
this.fieldCategories.forEach(element => {
this['indexingModels_' + element].forEach((elem: any) => {
- if (elem.identifier === 'docDate') {
+ if (elem.identifier === 'documentDate') {
elem.startDate = '';
elem.endDate = '_TODAY';
@@ -373,7 +373,7 @@ export class IndexingFormComponent implements OnInit {
elem.allowedEntities = elem.values.filter((val: any) => val.disabled === false).map((entities: any) => entities.id);
}
} else if (elem.identifier === 'arrivalDate') {
- elem.startDate = 'docDate';
+ elem.startDate = 'documentDate';
elem.endDate = '_TODAY';
} else if (elem.identifier === 'initiator' && !this.adminMode) {
@@ -389,7 +389,7 @@ export class IndexingFormComponent implements OnInit {
elem.endDate = '';
elem.event = 'setPriorityColorByLimitDate';
- } else if (elem.identifier === 'folder') {
+ } else if (elem.identifier === 'folders') {
elem.values = null;
} else if (elem.identifier === 'category_id') {
--
GitLab