From 8538ee86ca64cea78ab3dfb5f3fb67e347263935 Mon Sep 17 00:00:00 2001 From: Tobias Feldmann <t.feldmann@adito.de> Date: Wed, 12 Dec 2018 16:27:56 +0100 Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1029642][Historien - Anlegen und Symbole] --- entity/History_entity/entityfields/image/valueProcess.js | 7 ------- entity/History_entity/imageProcess.js | 5 +---- neonView/HistoryFilter_view/HistoryFilter_view.aod | 2 +- neonView/HistoryPreview_view/HistoryPreview_view.aod | 2 +- 4 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 entity/History_entity/entityfields/image/valueProcess.js diff --git a/entity/History_entity/entityfields/image/valueProcess.js b/entity/History_entity/entityfields/image/valueProcess.js deleted file mode 100644 index 63eb1a93f0..0000000000 --- a/entity/History_entity/entityfields/image/valueProcess.js +++ /dev/null @@ -1,7 +0,0 @@ -import("system.vars"); -import("system.result"); - -if(vars.getString("$field.DIRECTION") == 'i') - result.string("TEXT:IN"); -else - result.string("TEXT:OUT"); \ No newline at end of file diff --git a/entity/History_entity/imageProcess.js b/entity/History_entity/imageProcess.js index 63eb1a93f0..610fc40230 100644 --- a/entity/History_entity/imageProcess.js +++ b/entity/History_entity/imageProcess.js @@ -1,7 +1,4 @@ import("system.vars"); import("system.result"); -if(vars.getString("$field.DIRECTION") == 'i') - result.string("TEXT:IN"); -else - result.string("TEXT:OUT"); \ No newline at end of file +result.string(vars.getString("$field.ICON")); \ No newline at end of file diff --git a/neonView/HistoryFilter_view/HistoryFilter_view.aod b/neonView/HistoryFilter_view/HistoryFilter_view.aod index 5b70970e07..035397055d 100644 --- a/neonView/HistoryFilter_view/HistoryFilter_view.aod +++ b/neonView/HistoryFilter_view/HistoryFilter_view.aod @@ -96,7 +96,7 @@ <name>Treetable_template</name> <titleField>SUBJECT</titleField> <descriptionField>INFO</descriptionField> - <iconField>ICON</iconField> + <iconField>#IMAGE</iconField> <entityField>#ENTITY</entityField> </treetableViewTemplate> </children> diff --git a/neonView/HistoryPreview_view/HistoryPreview_view.aod b/neonView/HistoryPreview_view/HistoryPreview_view.aod index 7d8595f2c0..18522ce746 100644 --- a/neonView/HistoryPreview_view/HistoryPreview_view.aod +++ b/neonView/HistoryPreview_view/HistoryPreview_view.aod @@ -10,7 +10,7 @@ <children> <cardViewTemplate> <name>Card_template</name> - <iconField>IMAGE</iconField> + <iconField>ICON</iconField> <titleField>SUBJECT</titleField> <descriptionField>ENTRYDATE</descriptionField> <entityField>#ENTITY</entityField> -- GitLab