From fa92a36ff0420c30c83a1a9fbfac4e364ed6a69c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Fr=C3=A4der?= <a.fraeder@adito.de>
Date: Fri, 29 Oct 2021 12:55:10 +0200
Subject: [PATCH] =?UTF-8?q?[Projekt:=20xRM-Marketing][TicketNr.:=202001876?=
=?UTF-8?q?][Mosaico:=20Spalten=20in=20FilterView=20=C3=BCberarbeiten]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../MosaicoTemplate_entity.aod | 7 ++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 4 +-
.../MosaicoTemplateFilter_view.aod | 40 +++++++++++++++----
3 files changed, 41 insertions(+), 10 deletions(-)
diff --git a/entity/MosaicoTemplate_entity/MosaicoTemplate_entity.aod b/entity/MosaicoTemplate_entity/MosaicoTemplate_entity.aod
index 266a7baa41..2c49610b8c 100644
--- a/entity/MosaicoTemplate_entity/MosaicoTemplate_entity.aod
+++ b/entity/MosaicoTemplate_entity/MosaicoTemplate_entity.aod
@@ -19,6 +19,7 @@
</entityField>
<entityField>
<name>DATE_EDIT</name>
+ <title>DATE_EDIT</title>
<contentType>DATE</contentType>
<valueProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
@@ -41,11 +42,15 @@
</entityField>
<entityField>
<name>USER_EDIT</name>
+ <title>USER_EDIT</title>
<contentType>TEXT</contentType>
+ <groupable v="true" />
<valueProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_NEW</name>
+ <title>USER_NEW</title>
+ <groupable v="true" />
<valueProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityProvider>
@@ -204,10 +209,12 @@
<dbRecordFieldMapping>
<name>USER_EDIT.value</name>
<recordfield>MOSAICOTEMPLATE.USER_EDIT</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_NEW.value</name>
<recordfield>MOSAICOTEMPLATE.USER_NEW</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>BASETEMPLATE.value</name>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index af67331158..8cdb8064a0 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -7427,11 +7427,11 @@
</entry>
<entry>
<key>USER_NEW</key>
- <value>USER_NEW</value>
+ <value>Ersteller</value>
</entry>
<entry>
<key>USER_EDIT</key>
- <value>USER_EDIT</value>
+ <value>Bearbeiter</value>
</entry>
<entry>
<key>Mailing to customer</key>
diff --git a/neonView/MosaicoTemplateFilter_view/MosaicoTemplateFilter_view.aod b/neonView/MosaicoTemplateFilter_view/MosaicoTemplateFilter_view.aod
index 91f7176e1d..6ae3d7374f 100644
--- a/neonView/MosaicoTemplateFilter_view/MosaicoTemplateFilter_view.aod
+++ b/neonView/MosaicoTemplateFilter_view/MosaicoTemplateFilter_view.aod
@@ -20,6 +20,14 @@
<name>7c757f7e-0b46-489c-80eb-58c1413492a3</name>
<entityField>NAME</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>a1927d82-e243-4aed-acc1-dce9746ca1eb</name>
+ <entityField>ISOLANGUAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>4aa87d26-ac44-458d-b8ab-d9550caffb17</name>
+ <entityField>CATEGORY</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>df065e6d-388a-4258-839f-8dafa206bd5c</name>
<entityField>BASETEMPLATE</entityField>
@@ -29,12 +37,16 @@
<entityField>DATE_NEW</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>a1927d82-e243-4aed-acc1-dce9746ca1eb</name>
- <entityField>ISOLANGUAGE</entityField>
+ <name>3336ff2e-1c72-4a28-a35e-e20b50465d07</name>
+ <entityField>DATE_EDIT</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>4aa87d26-ac44-458d-b8ab-d9550caffb17</name>
- <entityField>CATEGORY</entityField>
+ <name>fbf4d084-0e52-4553-a821-4cc0c2214953</name>
+ <entityField>USER_NEW</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>61dba93d-ae1c-41a4-bdfb-7a5048dfa453</name>
+ <entityField>USER_EDIT</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
@@ -49,6 +61,14 @@
<name>1f1a33eb-fe91-4eac-961d-fa91b48dcf23</name>
<entityField>NAME</entityField>
</neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>02429f3d-3d1a-4fc3-82a6-b1e4195c4196</name>
+ <entityField>ISOLANGUAGE</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>8a3e0e78-0a7c-47c2-a994-0b53fa402d86</name>
+ <entityField>CATEGORY</entityField>
+ </neonTreeTableColumn>
<neonTreeTableColumn>
<name>d492493a-250a-4886-9da7-0808bb590709</name>
<entityField>BASETEMPLATE</entityField>
@@ -58,12 +78,16 @@
<entityField>DATE_NEW</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
- <name>02429f3d-3d1a-4fc3-82a6-b1e4195c4196</name>
- <entityField>ISOLANGUAGE</entityField>
+ <name>72147883-0ae6-40c4-9496-ffe5f63d651d</name>
+ <entityField>USER_NEW</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
- <name>8a3e0e78-0a7c-47c2-a994-0b53fa402d86</name>
- <entityField>CATEGORY</entityField>
+ <name>6dcd7afc-2bf8-49eb-acbb-8615d27ca332</name>
+ <entityField>DATE_EDIT</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>07883a0c-4d1d-4b37-babf-9da97cc8bd8c</name>
+ <entityField>USER_EDIT</entityField>
</neonTreeTableColumn>
</columns>
</treeTableViewTemplate>
--
GitLab