From 25315154f6f6a1db61659fb95e54d76fdde3231a Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 5 Jul 2019 14:07:14 +0200
Subject: [PATCH] fix tickets in modul tree
---
.../recordcontainers/jdito/contentProcess.js | 2 +-
.../recordcontainers/db/conditionProcess.js | 8 --------
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
index 95d7c11f3f..c9c7be12d0 100644
--- a/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
@@ -49,7 +49,7 @@ function queryChildrenElements (pContextName, pID) {
var ticketResult = db.table(SqlCondition.begin()
.andPrepare("TASK.PARENT_ID", pID)
.andPrepare("TASK.PARENT_CONTEXT", pContextName)
- .buildSql("select TASKID, PARENT_ID, PARENT_CONTEXT, SUBJECT, DESCRIPTION from TICKET left join TASK on TASK_ID = TASKID"));
+ .buildSql("select TICKETID, PARENT_ID, PARENT_CONTEXT, SUBJECT, DESCRIPTION from TICKET left join TASK on TASK_ID = TASKID"));
var activityResult = db.table(SqlCondition.begin()
.andPrepare("ACTIVITY.PARENT_ID", pID)
diff --git a/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js b/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
index ddefe83f37..d1dfb4c326 100644
--- a/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
@@ -6,12 +6,6 @@ import("system.result");
import("Sql_lib");
import("KeywordRegistry_basic");
-if (vars.exists("$sys.idvalues"))
-logging.log("a " + vars.getString("$sys.idvalues"))
-
-if (vars.exists("$local.idvalues"))
-logging.log("b " + vars.getString("$local.idvalues"))
-
var cond = new SqlCondition();
cond.andPrepare("TASK.TYPE", $KeywordRegistry.taskType$ticket())
.andPrepareVars("TICKET.TICKETTYPE", "$param.TicketType_param")
@@ -38,13 +32,11 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
if (loadNothing)
{
- logging.log("Nothing")
result.string("1=2");
}
else
{
//TODO: use a preparedCondition when available #1030812 #1034026
var resCond = db.translateCondition(cond.build("1=1"));
- logging.log(resCond)
result.string(resCond);
}
\ No newline at end of file
--
GitLab