From af19b511b269573e11af108e37931c898254c6f1 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 15 Oct 2019 16:09:46 +0200
Subject: [PATCH] SqlBuilder usage fix && missing translation
---
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod | 3 +++
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 1 +
language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 3 +++
process/Attribute_lib/process.js | 4 ++--
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 252f4f9d76..50c3cf2b35 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -5133,6 +5133,9 @@
<entry>
<key>Either or both a contact and a company must be specified</key>
</entry>
+ <entry>
+ <key>Attribute groups can't be selected</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index d834509c11..77be6535b8 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -6445,6 +6445,7 @@
</entry>
<entry>
<key>${CONTRACT_STATUS}</key>
+ <value>Vertragsstatus</value>
</entry>
<entry>
<key>Time in minutes</key>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 3a8d684a03..135724535a 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -5183,6 +5183,9 @@
<entry>
<key>Either or both a contact and a company must be specified</key>
</entry>
+ <entry>
+ <key>Attribute groups can't be selected</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 0ee28b832a..78498993cd 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -632,8 +632,8 @@ AttributeRelationUtils.validateAttributeCount = function (pRowId, pObjectType, p
var minMaxCountsSelect = newSelect("AB_ATTRIBUTEID, ATTRIBUTE_NAME, MIN_COUNT, MAX_COUNT")
.from("AB_ATTRIBUTEUSAGE")
.join("AB_ATTRIBUTE", "AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID")
- .and("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", possibleAttributes, SqlBuilder.IN())
- .andPrepare("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType)
+ .where("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", possibleAttributes, SqlBuilder.IN())
+ .and("AB_ATTRIBUTEUSAGE.OBJECT_TYPE", pObjectType)
//retrieve all min/max counts of the possible attributes
minMaxCounts = minMaxCountsSelect.table();
--
GitLab