From 3c5da06ec8d63ab1e346013b8b80dc4e2337a663 Mon Sep 17 00:00:00 2001
From: "p.neub" <p.neub@adito.de>
Date: Fri, 1 Oct 2021 15:14:07 +0200
Subject: [PATCH] [Projekt: xRM-Sales][TicketNr.: 2001145][Salesproject:
Attributes: Team: AditoIllegalStateException]
---
.../recordcontainers/jdito/contentProcess.js | 47 +++++++++++--------
1 file changed, 28 insertions(+), 19 deletions(-)
diff --git a/entity/MSTTeam_entity/recordcontainers/jdito/contentProcess.js b/entity/MSTTeam_entity/recordcontainers/jdito/contentProcess.js
index 8bb344f8b87..e23d0ced9ce 100644
--- a/entity/MSTTeam_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/MSTTeam_entity/recordcontainers/jdito/contentProcess.js
@@ -3,33 +3,42 @@ import("system.vars");
import("system.teams");
import("system.entities");
import("system.db");
-import("Sql_lib");
import("Util_lib");
+import("Sql_lib");
+import("MSTeams_lib");
-var data = newSelect([
- "MST_TEAM.MST_TEAMID",
- "MST_TEAM.TEAMNAME",
- "MST_TEAM.IS_ARCHIVED"
-]).from("MST_TEAM").table();
-
-var idvalues = vars.get("$local.idvalues");
-if(idvalues)
+if(MSTeamsUtils.isTeamsEnabled())
{
- var iddata = data.filter(function(entry){return idvalues.includes(entry[0])});
- if(iddata.length < idvalues.length)
+ var data = newSelect([
+ "MST_TEAM.MST_TEAMID",
+ "MST_TEAM.TEAMNAME",
+ "MST_TEAM.IS_ARCHIVED"
+ ]).from("MST_TEAM").table();
+
+ var idvalues = vars.get("$local.idvalues");
+ if(idvalues)
+ {
+ var iddata = data.filter(function(entry){return idvalues.includes(entry[0])});
+ if(iddata.length < idvalues.length)
+ {
+ iddata = _apiData().filter(function(entry){return idvalues.includes(entry[0])});
+ }
+ result.object(iddata);
+ }
+ else
{
- iddata = _apiData().filter(function(entry){return idvalues.includes(entry[0])});
+ var apiData = _apiData();
+ if(!vars.get("$param.IncludeArchived_param"))
+ {
+ apiData = apiData.filter(function(entry){return !Utils.toBoolean(entry[2])});
+ }
+ result.object(apiData);
}
- result.object(iddata);
}
else
{
- var apiData = _apiData();
- if(!vars.get("$param.IncludeArchived_param"))
- {
- apiData = apiData.filter(function(entry){return !Utils.toBoolean(entry[2])});
- }
- result.object(apiData);
+ // return nothing if teams is disabled
+ result.object([]);
}
/**
--
GitLab