From f40dc02029084f793dd459813ce3a957c27edcdc Mon Sep 17 00:00:00 2001
From: Markus Escher <m.escher@adito.de>
Date: Fri, 3 May 2019 14:34:05 +0200
Subject: [PATCH] add neon.colorconstants in TaskEntity remove colorConstants
from KeywordRegistry since its integrated in core
---
.../entityfields/priority_icon/colorProcess.js | 9 +++++----
process/KeywordRegistry_basic/process.js | 8 --------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/entity/Task_entity/entityfields/priority_icon/colorProcess.js b/entity/Task_entity/entityfields/priority_icon/colorProcess.js
index 0c379549af..f15523e724 100644
--- a/entity/Task_entity/entityfields/priority_icon/colorProcess.js
+++ b/entity/Task_entity/entityfields/priority_icon/colorProcess.js
@@ -1,20 +1,21 @@
import("system.vars");
import("KeywordRegistry_basic");
import("system.result");
+import("system.neon");
switch(vars.getString("$field.PRIORITY"))
{
case $KeywordRegistry.taskPriority$none():
- result.string($KeywordRegistry.colorStyle$priorityNone());
+ result.string(neon.PRIORITY_NONE_COLOR);
break;
case $KeywordRegistry.taskPriority$low():
- result.string($KeywordRegistry.colorStyle$priorityLow());
+ result.string(neon.PRIORITY_LOW_COLOR);
break;
case $KeywordRegistry.taskPriority$medium():
- result.string($KeywordRegistry.colorStyle$priorityMedium()());
+ result.string(neon.PRIORITY_MEDIUM_COLOR);
break;
case $KeywordRegistry.taskPriority$high():
- result.string($KeywordRegistry.colorStyle$priorityHigh());
+ result.string(neon.PRIORITY_HIGH_COLOR);
break;
}
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 8cdf00eed9..c5d0caf1d1 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -86,11 +86,3 @@ $KeywordRegistry.campaignState$planning = function(){return "e04c9c59-0590-463c-
$KeywordRegistry.campaignStepState = function(){return "CampaignManagementStepStates";};
$KeywordRegistry.campaignStepState$open = function(){return "bbf69673-2ec6-46f8-b231-684a31be9fbd";};
$KeywordRegistry.campaignStepCostCategory = function(){return "CampaignManagementCostCategory";};
-
-$KeywordRegistry.colorStyle$priorityNone = function(){return "$priority-none-color";};
-$KeywordRegistry.colorStyle$priorityLow = function(){return "$priority-low-color";};
-$KeywordRegistry.colorStyle$priorityMedium = function(){return "$priority-medium-color";};
-$KeywordRegistry.colorStyle$priorityHigh = function(){return "$priority-high-color";};
-$KeywordRegistry.colorStyle$brand = function(){return "$brand-color";};
-$KeywordRegistry.colorStyle$primaryAccent = function(){return "$primary-accent-color";};
-$KeywordRegistry.colorStyle$secondaryAccent = function(){return "$secondary-accent-color";};
--
GitLab