From c97cddf84ca6e1b4f2495b6d3b3f2f8c34475c86 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 29 Oct 2019 16:04:53 +0100
Subject: [PATCH] fix header / footer - missing binaryAlias in SqlCondition
---
.../entityfields/footer/valueProcess.js | 44 +++++++++----------
.../entityfields/header/valueProcess.js | 2 +-
.../entityfields/footer/valueProcess.js | 2 +-
.../entityfields/header/valueProcess.js | 2 +-
4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/entity/Offer_entity/entityfields/footer/valueProcess.js b/entity/Offer_entity/entityfields/footer/valueProcess.js
index 15f63197dc..86de6f0346 100644
--- a/entity/Offer_entity/entityfields/footer/valueProcess.js
+++ b/entity/Offer_entity/entityfields/footer/valueProcess.js
@@ -1,23 +1,23 @@
-import("Sql_lib");
-import("system.result");
-import("system.vars");
-import("system.neon");
-import("system.db");
-import("system.util");
-
-if(vars.exists("$param.OfferFooter_param") && vars.get("$param.OfferFooter_param"))
- result.string(vars.get("$param.OfferFooter_param"));
-
-else if(vars.get("$this.value"))
- result.string(vars.get("$this.value"));
-
-else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string("Vielen Dank!"); //TODO: translate
-
-if (vars.get("$field.ChoosenTEXFooter") != "")
-{
- var binaryId = db.cell(SqlCondition.begin()
- .andPrepareVars("ASYS_BINARIES.ROW_ID", "$field.ChoosenTEXFooter")
- .buildSql("select ID from ASYS_BINARIES"), SqlUtils.getBinariesAlias());
- result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getBinariesAlias())));
+import("Sql_lib");
+import("system.result");
+import("system.vars");
+import("system.neon");
+import("system.db");
+import("system.util");
+
+if(vars.exists("$param.OfferFooter_param") && vars.get("$param.OfferFooter_param"))
+ result.string(vars.get("$param.OfferFooter_param"));
+
+else if(vars.get("$this.value"))
+ result.string(vars.get("$this.value"));
+
+else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string("Vielen Dank!"); //TODO: translate
+
+if (vars.get("$field.ChoosenTEXFooter") != "")
+{
+ var binaryId = db.cell(SqlCondition.begin(SqlUtils.getBinariesAlias())
+ .andPrepareVars("ASYS_BINARIES.ROW_ID", "$field.ChoosenTEXFooter")
+ .buildSql("select ID from ASYS_BINARIES"), SqlUtils.getBinariesAlias());
+ result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getBinariesAlias())));
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/header/valueProcess.js b/entity/Offer_entity/entityfields/header/valueProcess.js
index a06ff095b1..1ccf4448bc 100644
--- a/entity/Offer_entity/entityfields/header/valueProcess.js
+++ b/entity/Offer_entity/entityfields/header/valueProcess.js
@@ -16,7 +16,7 @@ else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
if (vars.get("$field.ChoosenTEXHeader") != "")
{
- var binaryId = db.cell(SqlCondition.begin()
+ var binaryId = db.cell(SqlCondition.begin(SqlUtils.getBinariesAlias())
.andPrepareVars("ASYS_BINARIES.ROW_ID", "$field.ChoosenTEXHeader")
.buildSql("select ID from ASYS_BINARIES"), SqlUtils.getBinariesAlias());
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getBinariesAlias())));
diff --git a/entity/Order_entity/entityfields/footer/valueProcess.js b/entity/Order_entity/entityfields/footer/valueProcess.js
index c1f95afc65..1a9890c5fc 100644
--- a/entity/Order_entity/entityfields/footer/valueProcess.js
+++ b/entity/Order_entity/entityfields/footer/valueProcess.js
@@ -20,7 +20,7 @@ if (vars.get("$this.value") == null)
if (vars.get("$field.ChosenTexFooter") != "")
{
- var binaryId = db.cell(SqlCondition.begin()
+ var binaryId = db.cell(SqlCondition.begin(SqlUtils.getBinariesAlias())
.andPrepareVars("ASYS_BINARIES.ROW_ID", "$field.ChosenTexFooter")
.buildSql("select ID from ASYS_BINARIES"), SqlUtils.getBinariesAlias());
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getBinariesAlias())));
diff --git a/entity/Order_entity/entityfields/header/valueProcess.js b/entity/Order_entity/entityfields/header/valueProcess.js
index 7dd541dea0..2f1398f5c3 100644
--- a/entity/Order_entity/entityfields/header/valueProcess.js
+++ b/entity/Order_entity/entityfields/header/valueProcess.js
@@ -18,7 +18,7 @@ if (vars.get("$this.value") == null)
if (vars.get("$field.ChosenTexHeader") != "")
{
- var binaryId = db.cell(SqlCondition.begin()
+ var binaryId = db.cell(SqlCondition.begin(SqlUtils.getBinariesAlias())
.andPrepareVars("ASYS_BINARIES.ROW_ID", "$field.ChosenTexHeader")
.buildSql("select ID from ASYS_BINARIES"), SqlUtils.getBinariesAlias());
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, SqlUtils.getBinariesAlias())));
--
GitLab