From a74224439ed46e79274b37ff068ec96a01da3189 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 9 Apr 2019 10:56:10 +0200
Subject: [PATCH] Activity: performance optimisation

---
 .../entityfields/category/displayValueProcess.js     | 12 ++++++------
 .../entityfields/subject_details/valueProcess.js     |  6 ++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/entity/Activity_entity/entityfields/category/displayValueProcess.js b/entity/Activity_entity/entityfields/category/displayValueProcess.js
index 05aefdcf53..5a77b55212 100644
--- a/entity/Activity_entity/entityfields/category/displayValueProcess.js
+++ b/entity/Activity_entity/entityfields/category/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.activityCategory(), vars.get("$field.CATEGORY")));
+import("system.result");
+import("system.vars");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.activityCategory(), vars.get("$field.CATEGORY")));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/subject_details/valueProcess.js b/entity/Activity_entity/entityfields/subject_details/valueProcess.js
index c30d6b2520..db1ed69d22 100644
--- a/entity/Activity_entity/entityfields/subject_details/valueProcess.js
+++ b/entity/Activity_entity/entityfields/subject_details/valueProcess.js
@@ -1,7 +1,5 @@
 import("system.vars");
 import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
 
-var histMedium = vars.get("$field.CATEGORY");
-result.string(vars.get("$field.SUBJECT") + (histMedium ? " (" + KeywordUtils.getViewValue($KeywordRegistry.activityCategory(), histMedium) + ")" : ""));
+var category = vars.get("$field.CATEGORY.displayValue");
+result.string(vars.get("$field.SUBJECT") + (category ? " (" + category + ")" : ""));
\ No newline at end of file
-- 
GitLab