diff --git a/entity/Weblink_entity/Weblink_entity.aod b/entity/Weblink_entity/Weblink_entity.aod
index 3de5e57011653877b476d970c9aeafd830eb4b1e..ba40c32758c338e9b683a319b8a4e7aa3b00a991 100644
--- a/entity/Weblink_entity/Weblink_entity.aod
+++ b/entity/Weblink_entity/Weblink_entity.aod
@@ -43,11 +43,12 @@
<entityField>
<name>USER_EDIT</name>
<title>Editor</title>
+ <groupable v="false" />
<valueProcess>%aditoprj%/entity/Weblink_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>SCORE</name>
- <title>Score</title>
+ <title>${WEBLINK_SCORE}</title>
<contentType>NUMBER</contentType>
<outputFormat>#' Punkte'</outputFormat>
<valueProcess>%aditoprj%/entity/Weblink_entity/entityfields/score/valueProcess.js</valueProcess>
@@ -56,6 +57,7 @@
<name>LINKTYPE</name>
<title>Link Type</title>
<consumer>KeywordLinkType</consumer>
+ <groupable v="true" />
<mandatory v="true" />
</entityField>
<entityField>
@@ -253,6 +255,7 @@
<dbRecordFieldMapping>
<name>LINKTYPE.displayValue</name>
<expression>%aditoprj%/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/linktype.displayvalue/expression.js</expression>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PLACEHOLDER.value</name>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 54877615643425e6c73f3cb12e87d10e65e19b8c..98ebae73e7b607f792f02f1f0b184b190ab91808 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -11111,6 +11111,24 @@
<entry>
<key>Mailing to customer</key>
</entry>
+ <entry>
+ <key>Create only person</key>
+ </entry>
+ <entry>
+ <key>Slave administration '%0' is '%1'</key>
+ </entry>
+ <entry>
+ <key>The file did not contain any data</key>
+ </entry>
+ <entry>
+ <key>Slave administration</key>
+ </entry>
+ <entry>
+ <key>Mosaico template</key>
+ </entry>
+ <entry>
+ <key>${WEBLINK_SCORE}</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 517a6ab607868f82b5596c0a004aabd5fd386357..59530e3d86e5c84ffcf1e494002b83879386c727 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -364,6 +364,10 @@
<key>Contact & Serviceticket</key>
<value>Kontakt & Serviceticket</value>
</entry>
+ <entry>
+ <key>${WEBLINK_SCORE}</key>
+ <value>Punkte</value>
+ </entry>
<entry>
<key>Interest (subscribed)</key>
<value>Interesse (abonniert)</value>
@@ -390,7 +394,7 @@
</entry>
<entry>
<key>Received</key>
- <value>Empfangen</value>
+ <value>Zugestellt</value>
</entry>
<entry>
<key>Change responsible</key>
@@ -1101,6 +1105,7 @@
</entry>
<entry>
<key>Technical email</key>
+ <value>Technische E-Mail</value>
</entry>
<entry>
<key>Please check if the following fields are filled correctly</key>
@@ -3253,6 +3258,7 @@
</entry>
<entry>
<key>Copy Recipients</key>
+ <value>Empfänger kopieren</value>
</entry>
<entry>
<key>dd.MM.yyyy</key>
@@ -6211,6 +6217,7 @@
</entry>
<entry>
<key>Action mail</key>
+ <value>Aktions E-Mail</value>
</entry>
<entry>
<key>Consultation</key>
@@ -7992,6 +7999,10 @@
<key>processed %0/%1:</key>
<value>%0/%1 verarbeitet:</value>
</entry>
+ <entry>
+ <key>Mosaico template</key>
+ <value>Mosaicovorlage</value>
+ </entry>
<entry>
<key>processing %0/%1</key>
<value>verarbeite %0/%1:</value>
@@ -8937,7 +8948,7 @@
</entry>
<entry>
<key>Communication Settings</key>
- <value>Werbeeinstellungen</value>
+ <value>Werbekennzeichen</value>
</entry>
<entry>
<key>SqlBuilder: invalid value-type for pCondition</key>
@@ -11375,7 +11386,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Invitation</key>
- <value>Inivation</value>
+ <value>Einladung</value>
</entry>
<entry>
<key>send as mail</key>
@@ -12399,7 +12410,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>URL</key>
- <value></value>
+ <value>URL</value>
</entry>
<entry>
<key>[TEST] Util_lib</key>
@@ -12572,7 +12583,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Remove recipients with advertising ban</key>
- <value>Empfänger mit Werbesperre entfernen</value>
+ <value>Empfänger mit Werbewiderspruch entfernen</value>
</entry>
<entry>
<key>wrong configuration for '%0'</key>
@@ -13249,6 +13260,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Remove recipients with communication rejection</key>
+ <value>Empfänger mit Werbewiderspruch entfernen</value>
</entry>
<entry>
<key>%0 companies were newley assigned. \n%1 companies are no longer assigned (these assignments got the status 'review'). \n%2 valid assignments were unchanged.\nThe Process took %3 seconds.</key>
@@ -14442,12 +14454,14 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Last Click</key>
+ <value>Letzter Klick</value>
</entry>
<entry>
<key>Opener rate (in %)</key>
</entry>
<entry>
<key>Evaluation type</key>
+ <value>Auswertungstyp</value>
</entry>
<entry>
<key>remove hashtags from favorite titles</key>
@@ -14524,12 +14538,6 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>A Phase filter has to be set when creating a checklistentry for the Salesproject context.</key>
</entry>
- <entry>
- <key>Open new mosaico template</key>
- </entry>
- <entry>
- <key>Do you really want to resynchronize the user completely?\nThe data in ADITO will be deleted.\nThe outlook contacts must be cleared manually.</key>
- </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 2eb9fd685016cd5925b317493490a583120812f9..e34caca3c5da2aac384d1f2ffc354e8ca63913c7 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -11207,6 +11207,24 @@
<entry>
<key>Mailing to customer</key>
</entry>
+ <entry>
+ <key>Create only person</key>
+ </entry>
+ <entry>
+ <key>Slave administration '%0' is '%1'</key>
+ </entry>
+ <entry>
+ <key>The file did not contain any data</key>
+ </entry>
+ <entry>
+ <key>Slave administration</key>
+ </entry>
+ <entry>
+ <key>Mosaico template</key>
+ </entry>
+ <entry>
+ <key>${WEBLINK_SCORE}</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/WeblinkEdit_view/WeblinkEdit_view.aod b/neonView/WeblinkEdit_view/WeblinkEdit_view.aod
index 0591c32d56b9831c6f8e5d43309b14349c0fe85d..a2f73f6bb97de365dee4b811a9fd839901786d4a 100644
--- a/neonView/WeblinkEdit_view/WeblinkEdit_view.aod
+++ b/neonView/WeblinkEdit_view/WeblinkEdit_view.aod
@@ -23,10 +23,6 @@
<name>70c52c3f-7e0b-4069-b56f-e0769f911efa</name>
<entityField>LINKTYPE</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>836aafd9-a8c3-4a7c-9b2c-260ec8bbee45</name>
- <entityField>SCORE</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>4313c2fb-3551-4c66-81c9-ad950c44a105</name>
<entityField>PLACEHOLDER</entityField>
@@ -35,6 +31,10 @@
<name>2b22fb4a-5e7e-48ee-b6d1-3ee4381fb419</name>
<entityField>ISREDIRECT</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>57d8f3b6-2c98-404f-97a6-efcb89828346</name>
+ <entityField>LINKEVALUATIONTYPE</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>65495a4d-dccf-42ba-bba4-af15b9ad06aa</name>
<entityField>ACTION_TYPE</entityField>
@@ -48,8 +48,8 @@
<entityField>WORKFLOWSIGNAL_NAME</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>57d8f3b6-2c98-404f-97a6-efcb89828346</name>
- <entityField>LINKEVALUATIONTYPE</entityField>
+ <name>836aafd9-a8c3-4a7c-9b2c-260ec8bbee45</name>
+ <entityField>SCORE</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/neonView/WeblinkFilter_view/WeblinkFilter_view.aod b/neonView/WeblinkFilter_view/WeblinkFilter_view.aod
index a0f9d529a163e1d3cf8c7fc35f59045013c5741e..890ef30e247b5eb5cfe14917dea8aa62885d042d 100644
--- a/neonView/WeblinkFilter_view/WeblinkFilter_view.aod
+++ b/neonView/WeblinkFilter_view/WeblinkFilter_view.aod
@@ -4,9 +4,9 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
- <noneLayout>
+ <groupLayout>
<name>layout</name>
- </noneLayout>
+ </groupLayout>
</layout>
<children>
<tableViewTemplate>
@@ -48,5 +48,43 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
+ <treeTableViewTemplate>
+ <name>TreeTable</name>
+ <hideContentSearch v="false" />
+ <columns>
+ <neonTreeTableColumn>
+ <name>8ca57c18-72f9-4c92-9aa8-d3b793c00252</name>
+ <entityField>#IMAGE</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>c3f84cc8-1caf-41c6-9186-259618b4bc76</name>
+ <entityField>URL</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>152da936-3780-4a56-ae17-cad5d3dd2241</name>
+ <entityField>LINKTYPE</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>c5da4c2c-4e04-48a0-a4ee-3b722afde544</name>
+ <entityField>SCORE</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>c09b0dae-5b83-4ebb-99d5-b9c035f428b2</name>
+ <entityField>Tags</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>928f3501-7d7a-4a3d-ba5b-d945066f10ef</name>
+ <entityField>dateLastClick</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>8cf0118f-01c2-44ad-b94f-3244058a9389</name>
+ <entityField>dateLastChange</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>9cc4ec4c-6104-475f-80f0-fb8a93257ff1</name>
+ <entityField>userLastChange</entityField>
+ </neonTreeTableColumn>
+ </columns>
+ </treeTableViewTemplate>
</children>
</neonView>