From 822ca573c559e85655719989c4acc3757041d788 Mon Sep 17 00:00:00 2001 From: Johannes Hoermann <j.hoermann@adito.de> Date: Wed, 28 Nov 2018 10:29:43 +0100 Subject: [PATCH] removed unused logging imports --- entity/Address_entity/conditionProcess.js | 1 - .../entityfields/date_new/valueProcess.js | 1 - .../entityfields/is_standard/onValueChange.js | 1 - .../entityfields/is_standard/valueProcess.js | 1 - .../entityfields/relation_id/valueProcess.js | 1 - .../entityfields/user_new/valueProcess.js | 1 - .../status/possibleItemsProcess.js | 41 +++--- entity/Appointment_entity/onInsert.js | 1 - entity/Appointment_entity/onUpdate.js | 1 - .../entityfields/addr/onValidation.js | 1 - .../entityfields/date_new/valueProcess.js | 1 - .../medium_id/possibleItemsProcess.js | 1 - .../entityfields/user_new/valueProcess.js | 1 - .../relation_id/linkedContextProcess.js | 1 - .../bindata_upload/onValueChange.js | 1 - entity/Document_entity/onInsert.js | 1 - entity/Document_entity/onUpdate.js | 1 - entity/History_entity/onDBDelete.js | 1 - .../entityfields/newoffer/onActionProcess.js | 1 - .../newofferversion/onActionProcess.js | 1 - entity/Offeritem_entity/conditionProcess.js | 1 - .../entityfields/product_id/onValueChange.js | 1 - .../product_id/possibleItemsProcess.js | 1 - .../entityfields/quantity/onValueChange.js | 1 - entity/Offeritem_entity/onDBUpdate.js | 1 - .../entityfields/org_date_new/valueProcess.js | 1 - .../entityfields/org_id/valueProcess.js | 1 - .../orgname/linkedContextProcess.js | 27 ++-- .../perspricelist_dfo/stateProcess.js | 1 - .../source_id/possibleItemsProcess.js | 7 +- .../entityfields/org_id/valueProcess.js | 1 - .../Productprice_entity/conditionProcess.js | 1 - entity/Stock_entity/conditionProcess.js | 1 - .../entityfields/stockcount/valueProcess.js | 1 - process/Appointment_lib/process.js | 139 +++++++++--------- process/Product_lib/process.js | 1 - process/Sql_lib/process.js | 4 +- 37 files changed, 105 insertions(+), 145 deletions(-) diff --git a/entity/Address_entity/conditionProcess.js b/entity/Address_entity/conditionProcess.js index 08c672c31be..7ee6a70eb73 100644 --- a/entity/Address_entity/conditionProcess.js +++ b/entity/Address_entity/conditionProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.result"); import("system.vars"); diff --git a/entity/Address_entity/entityfields/date_new/valueProcess.js b/entity/Address_entity/entityfields/date_new/valueProcess.js index eedddb3cf02..abfd3226611 100644 --- a/entity/Address_entity/entityfields/date_new/valueProcess.js +++ b/entity/Address_entity/entityfields/date_new/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); import("system.neon"); diff --git a/entity/Address_entity/entityfields/is_standard/onValueChange.js b/entity/Address_entity/entityfields/is_standard/onValueChange.js index c4170ac0088..3c35de46027 100644 --- a/entity/Address_entity/entityfields/is_standard/onValueChange.js +++ b/entity/Address_entity/entityfields/is_standard/onValueChange.js @@ -1,5 +1,4 @@ import("system.neon"); -import("system.logging"); import("system.vars"); vars.set("$image.EditedStandardAddressId", vars.get("$field.ADDRESSID")); diff --git a/entity/Address_entity/entityfields/is_standard/valueProcess.js b/entity/Address_entity/entityfields/is_standard/valueProcess.js index 793e8ffb480..3c3879da2a8 100644 --- a/entity/Address_entity/entityfields/is_standard/valueProcess.js +++ b/entity/Address_entity/entityfields/is_standard/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); diff --git a/entity/Address_entity/entityfields/relation_id/valueProcess.js b/entity/Address_entity/entityfields/relation_id/valueProcess.js index b4b2e6cbf5f..2d085e3aff5 100644 --- a/entity/Address_entity/entityfields/relation_id/valueProcess.js +++ b/entity/Address_entity/entityfields/relation_id/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.result"); import("system.neon"); import("system.vars"); diff --git a/entity/Address_entity/entityfields/user_new/valueProcess.js b/entity/Address_entity/entityfields/user_new/valueProcess.js index f9abb66712c..81966a3fbcd 100644 --- a/entity/Address_entity/entityfields/user_new/valueProcess.js +++ b/entity/Address_entity/entityfields/user_new/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); import("system.neon"); diff --git a/entity/Appointment_entity/entityfields/status/possibleItemsProcess.js b/entity/Appointment_entity/entityfields/status/possibleItemsProcess.js index cb333202064..af4adc54627 100644 --- a/entity/Appointment_entity/entityfields/status/possibleItemsProcess.js +++ b/entity/Appointment_entity/entityfields/status/possibleItemsProcess.js @@ -1,22 +1,21 @@ -import("system.logging"); -import("system.result"); -import("system.translate"); -import("system.calendars"); - -if( calendars.getBackendType() != calendars.BACKEND_EXCHANGEWS ) -{ - result.object([ - [calendars.STATUS_CONFIRMED, translate.text("Bestätigt")], - [calendars.STATUS_TENTATIVE, translate.text("Vorläufig")], - [calendars.STATUS_CANCELLED, translate.text("Abgesagt")] - ]); -} -else -{ - result.object( [ - [calendars.STATUS_BUSY, translate.text("Gebucht")], - [calendars.STATUS_TENTATIVE, translate.text("Vorläufig")], - [calendars.STATUS_OOF, translate.text("Außer Haus")], - [calendars.STATUS_FREE, translate.text("frei")] - ] ); +import("system.result"); +import("system.translate"); +import("system.calendars"); + +if( calendars.getBackendType() != calendars.BACKEND_EXCHANGEWS ) +{ + result.object([ + [calendars.STATUS_CONFIRMED, translate.text("Bestätigt")], + [calendars.STATUS_TENTATIVE, translate.text("Vorläufig")], + [calendars.STATUS_CANCELLED, translate.text("Abgesagt")] + ]); +} +else +{ + result.object( [ + [calendars.STATUS_BUSY, translate.text("Gebucht")], + [calendars.STATUS_TENTATIVE, translate.text("Vorläufig")], + [calendars.STATUS_OOF, translate.text("Außer Haus")], + [calendars.STATUS_FREE, translate.text("frei")] + ] ); } \ No newline at end of file diff --git a/entity/Appointment_entity/onInsert.js b/entity/Appointment_entity/onInsert.js index aab9e275f5e..9bbaf367e6d 100644 --- a/entity/Appointment_entity/onInsert.js +++ b/entity/Appointment_entity/onInsert.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.neon"); import("system.calendars"); import("system.vars"); diff --git a/entity/Appointment_entity/onUpdate.js b/entity/Appointment_entity/onUpdate.js index 8761d4bf407..f847e096577 100644 --- a/entity/Appointment_entity/onUpdate.js +++ b/entity/Appointment_entity/onUpdate.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.neon"); import("system.calendars"); import("system.vars"); diff --git a/entity/Comm_entity/entityfields/addr/onValidation.js b/entity/Comm_entity/entityfields/addr/onValidation.js index 636a54f8673..46ef6151623 100644 --- a/entity/Comm_entity/entityfields/addr/onValidation.js +++ b/entity/Comm_entity/entityfields/addr/onValidation.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.translate"); import("system.vars"); import("system.net"); diff --git a/entity/Comm_entity/entityfields/date_new/valueProcess.js b/entity/Comm_entity/entityfields/date_new/valueProcess.js index eedddb3cf02..abfd3226611 100644 --- a/entity/Comm_entity/entityfields/date_new/valueProcess.js +++ b/entity/Comm_entity/entityfields/date_new/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); import("system.neon"); diff --git a/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js b/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js index 4f577af9f62..abec3313396 100644 --- a/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js +++ b/entity/Comm_entity/entityfields/medium_id/possibleItemsProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.text"); import("system.vars"); import("system.result"); diff --git a/entity/Comm_entity/entityfields/user_new/valueProcess.js b/entity/Comm_entity/entityfields/user_new/valueProcess.js index f9abb66712c..81966a3fbcd 100644 --- a/entity/Comm_entity/entityfields/user_new/valueProcess.js +++ b/entity/Comm_entity/entityfields/user_new/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); import("system.neon"); diff --git a/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js b/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js index 2b4986de616..fd07f7811a3 100644 --- a/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js +++ b/entity/Contract_entity/entityfields/relation_id/linkedContextProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); import("system.neon"); diff --git a/entity/Document_entity/entityfields/bindata_upload/onValueChange.js b/entity/Document_entity/entityfields/bindata_upload/onValueChange.js index 6f86a738534..bac80becd0f 100644 --- a/entity/Document_entity/entityfields/bindata_upload/onValueChange.js +++ b/entity/Document_entity/entityfields/bindata_upload/onValueChange.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.neon"); import("Entity_lib"); diff --git a/entity/Document_entity/onInsert.js b/entity/Document_entity/onInsert.js index 5bb825c7b84..89af5c1e514 100644 --- a/entity/Document_entity/onInsert.js +++ b/entity/Document_entity/onInsert.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.db"); import("system.vars"); import("Document_lib"); diff --git a/entity/Document_entity/onUpdate.js b/entity/Document_entity/onUpdate.js index b43e4f3eaeb..a75b4ed4291 100644 --- a/entity/Document_entity/onUpdate.js +++ b/entity/Document_entity/onUpdate.js @@ -1,6 +1,5 @@ import("system.vars"); import("system.db"); -import("system.logging"); import("Document_lib"); var id = vars.get("$field.ID"); diff --git a/entity/History_entity/onDBDelete.js b/entity/History_entity/onDBDelete.js index 2949aff8f67..c054511acc1 100644 --- a/entity/History_entity/onDBDelete.js +++ b/entity/History_entity/onDBDelete.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.db"); diff --git a/entity/Offer_entity/entityfields/newoffer/onActionProcess.js b/entity/Offer_entity/entityfields/newoffer/onActionProcess.js index 46d81aed97b..be634293e5d 100644 --- a/entity/Offer_entity/entityfields/newoffer/onActionProcess.js +++ b/entity/Offer_entity/entityfields/newoffer/onActionProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.neon"); import("Util_lib"); diff --git a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js index 7482f38129f..8b605bf652b 100644 --- a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js +++ b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.neon"); import("Util_lib"); diff --git a/entity/Offeritem_entity/conditionProcess.js b/entity/Offeritem_entity/conditionProcess.js index b39721ef89a..810d73b9116 100644 --- a/entity/Offeritem_entity/conditionProcess.js +++ b/entity/Offeritem_entity/conditionProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.result"); import("system.vars"); diff --git a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js index 252419a862f..7efabfffbaa 100644 --- a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js +++ b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.neon"); import("Product_lib"); diff --git a/entity/Offeritem_entity/entityfields/product_id/possibleItemsProcess.js b/entity/Offeritem_entity/entityfields/product_id/possibleItemsProcess.js index f9ee3edbce8..e19938f82d7 100644 --- a/entity/Offeritem_entity/entityfields/product_id/possibleItemsProcess.js +++ b/entity/Offeritem_entity/entityfields/product_id/possibleItemsProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.result"); import("system.db"); import("Sql_lib"); diff --git a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js index aedc968cc70..1bd2ecab5dd 100644 --- a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js +++ b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.neon"); import("Product_lib"); diff --git a/entity/Offeritem_entity/onDBUpdate.js b/entity/Offeritem_entity/onDBUpdate.js index 2634bf71937..b08fccbcce9 100644 --- a/entity/Offeritem_entity/onDBUpdate.js +++ b/entity/Offeritem_entity/onDBUpdate.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.db"); import("system.neon"); diff --git a/entity/Org_entity/entityfields/org_date_new/valueProcess.js b/entity/Org_entity/entityfields/org_date_new/valueProcess.js index eedddb3cf02..abfd3226611 100644 --- a/entity/Org_entity/entityfields/org_date_new/valueProcess.js +++ b/entity/Org_entity/entityfields/org_date_new/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); import("system.neon"); diff --git a/entity/Pers_entity/entityfields/org_id/valueProcess.js b/entity/Pers_entity/entityfields/org_id/valueProcess.js index 2c20db8f32f..0e785910dda 100644 --- a/entity/Pers_entity/entityfields/org_id/valueProcess.js +++ b/entity/Pers_entity/entityfields/org_id/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); import("system.neon"); diff --git a/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js b/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js index d2f6c19c344..b2ea995a125 100644 --- a/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js +++ b/entity/Pers_entity/entityfields/orgname/linkedContextProcess.js @@ -1,14 +1,13 @@ -import("system.logging"); -import("system.vars"); -import("system.result"); -import("system.neon"); - -var orgid = vars.getString("$field.ORGID"); - -if(vars.exists("$image.lookup_orgname") && vars.get("$image.lookup_orgname") != '') - result.string("Org_context"); -else if((orgid == null || orgid.trim() == "0") - && (vars.get("$sys.operatingstate") != neon.OPERATINGSTATE_NEW)) - result.string(null); -else - result.string("Org_context"); +import("system.vars"); +import("system.result"); +import("system.neon"); + +var orgid = vars.getString("$field.ORGID"); + +if(vars.exists("$image.lookup_orgname") && vars.get("$image.lookup_orgname") != '') + result.string("Org_context"); +else if((orgid == null || orgid.trim() == "0") + && (vars.get("$sys.operatingstate") != neon.OPERATINGSTATE_NEW)) + result.string(null); +else + result.string("Org_context"); diff --git a/entity/Pers_entity/entityfields/perspricelist_dfo/stateProcess.js b/entity/Pers_entity/entityfields/perspricelist_dfo/stateProcess.js index 41f9da82fe6..ae86a254b64 100644 --- a/entity/Pers_entity/entityfields/perspricelist_dfo/stateProcess.js +++ b/entity/Pers_entity/entityfields/perspricelist_dfo/stateProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); diff --git a/entity/Prod2prod_entity/entityfields/source_id/possibleItemsProcess.js b/entity/Prod2prod_entity/entityfields/source_id/possibleItemsProcess.js index ce35858aa77..19904fc3d9a 100644 --- a/entity/Prod2prod_entity/entityfields/source_id/possibleItemsProcess.js +++ b/entity/Prod2prod_entity/entityfields/source_id/possibleItemsProcess.js @@ -2,7 +2,6 @@ import("system.vars"); import("system.result"); import("system.db"); import("system.neon"); -import("system.logging"); import("Keyword_lib"); import("Product_lib"); @@ -12,11 +11,7 @@ if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys var prodid = vars.get("$field.DEST_ID"); var excludeableProds = [prodid]; - var p2pUtils = new Prod2ProdUtils(prodid); - - logging.log("partslist:" + p2pUtils.getPartsListProdIds()); - logging.log("parentlist:" + p2pUtils.getParentProdIds()); - + var p2pUtils = new Prod2ProdUtils(prodid); excludeableProds = excludeableProds.concat(p2pUtils.getPartsListProdIds()); excludeableProds = excludeableProds.concat(p2pUtils.getParentProdIds()); diff --git a/entity/Product_entity/entityfields/org_id/valueProcess.js b/entity/Product_entity/entityfields/org_id/valueProcess.js index d1edd60f9f8..de32e15c56f 100644 --- a/entity/Product_entity/entityfields/org_id/valueProcess.js +++ b/entity/Product_entity/entityfields/org_id/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.vars"); import("system.result"); import("system.neon"); diff --git a/entity/Productprice_entity/conditionProcess.js b/entity/Productprice_entity/conditionProcess.js index c09f20de054..440dbdb5cb6 100644 --- a/entity/Productprice_entity/conditionProcess.js +++ b/entity/Productprice_entity/conditionProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.result"); import("system.vars"); diff --git a/entity/Stock_entity/conditionProcess.js b/entity/Stock_entity/conditionProcess.js index 8f62c84c72d..530b6b4554e 100644 --- a/entity/Stock_entity/conditionProcess.js +++ b/entity/Stock_entity/conditionProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.result"); import("system.vars"); diff --git a/entity/Stock_entity/entityfields/stockcount/valueProcess.js b/entity/Stock_entity/entityfields/stockcount/valueProcess.js index 4c32e2524ed..ca5d66d8992 100644 --- a/entity/Stock_entity/entityfields/stockcount/valueProcess.js +++ b/entity/Stock_entity/entityfields/stockcount/valueProcess.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.result"); import("system.vars"); import("Product_lib"); diff --git a/process/Appointment_lib/process.js b/process/Appointment_lib/process.js index 476a993b04c..ee83066b4c7 100644 --- a/process/Appointment_lib/process.js +++ b/process/Appointment_lib/process.js @@ -1,71 +1,70 @@ -import("system.neon"); -import("system.logging"); -import("system.text"); - -function AppointmentUtils() -{ - - /** - * Sets the partstat of the current users as given param state - * currentUserUri: string currentUserUri - * attendees: MSencoded calendarusers - * state: sets partstat - */ - this.setPartStat = function (currentUserUri, attendees, newState) - { - attendeesDecodedArray = text.decodeMS(attendees); - - for(var i = 0; i < attendeesDecodedArray.length; i++) - { - var decoded = text.decodeMS(attendeesDecodedArray[i]) - if(decoded[0] == currentUserUri) - { - var updated = new Array(); - - var isSet = false; - for (var j = 0; j < decoded.length; j++) - { - if (decoded[j].substr(0, 9) == "PARTSTAT:") - { - updated.push("PARTSTAT:" + newState); - isSet = true; - } - else - { - updated.push(decoded[j]) - } - } - - if (!isSet) - { - updated.push("PARTSTAT:" + newState); - } - - // Updaten Attendees - var newAttendees = new Array(); - for (var x = 0; x < attendeesDecodedArray.length; x++) - { - if (text.decodeMS(attendeesDecodedArray[x])[0] == currentUserUri) - { - newAttendees.push(text.encodeMS( updated)) - } - else - { - newAttendees.push(attendeesDecodedArray[x]) - } - } - break; - } - } - - return text.encodeMS(newAttendees); - } - - - this.sendExchangedAction = function(event, newState) - { - event["X-ADITO-STATUSACTION"] = newState; // "ACCEPT", "DECLINE", "" - event[calendars.AFFECTEDUSERS] = ""; - calendars.updateEntry(event); - } +import("system.neon"); +import("system.text"); + +function AppointmentUtils() +{ + + /** + * Sets the partstat of the current users as given param state + * currentUserUri: string currentUserUri + * attendees: MSencoded calendarusers + * state: sets partstat + */ + this.setPartStat = function (currentUserUri, attendees, newState) + { + attendeesDecodedArray = text.decodeMS(attendees); + + for(var i = 0; i < attendeesDecodedArray.length; i++) + { + var decoded = text.decodeMS(attendeesDecodedArray[i]) + if(decoded[0] == currentUserUri) + { + var updated = new Array(); + + var isSet = false; + for (var j = 0; j < decoded.length; j++) + { + if (decoded[j].substr(0, 9) == "PARTSTAT:") + { + updated.push("PARTSTAT:" + newState); + isSet = true; + } + else + { + updated.push(decoded[j]) + } + } + + if (!isSet) + { + updated.push("PARTSTAT:" + newState); + } + + // Updaten Attendees + var newAttendees = new Array(); + for (var x = 0; x < attendeesDecodedArray.length; x++) + { + if (text.decodeMS(attendeesDecodedArray[x])[0] == currentUserUri) + { + newAttendees.push(text.encodeMS( updated)) + } + else + { + newAttendees.push(attendeesDecodedArray[x]) + } + } + break; + } + } + + return text.encodeMS(newAttendees); + } + + + this.sendExchangedAction = function(event, newState) + { + event["X-ADITO-STATUSACTION"] = newState; // "ACCEPT", "DECLINE", "" + event[calendars.AFFECTEDUSERS] = ""; + calendars.updateEntry(event); + } } \ No newline at end of file diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js index 94451a5e126..fd59d1bfe57 100644 --- a/process/Product_lib/process.js +++ b/process/Product_lib/process.js @@ -1,4 +1,3 @@ -import("system.logging"); import("system.SQLTYPES"); import("system.datetime"); import("system.db"); diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js index f928b3fdb0e..c58c9ba1b75 100644 --- a/process/Sql_lib/process.js +++ b/process/Sql_lib/process.js @@ -165,7 +165,7 @@ SqlCondition.prototype.toWhereString = function(alternativeCond){ * @return {Array[][][]} Prepared condition with [condition, [[field1, type1], [field2, type2]]] */ SqlCondition.prototype.build = function(alternativeCond){ - return [cond.toString(alternativeCond), cond.preparedValues]; + return [this.toString(alternativeCond), this.preparedValues]; } /** @@ -177,7 +177,7 @@ SqlCondition.prototype.build = function(alternativeCond){ */ SqlCondition.prototype.buildSelect = function(beforeCondition, alternativeCond, afterCondition) { if (afterCondition == undefined) { afterCondition = "" }; - return [beforeCondition + " " + cond.toWhereString(alternativeCond) + " " + afterCondition, cond.preparedValues]; + return [beforeCondition + " " + this.toWhereString(alternativeCond) + " " + afterCondition, this.preparedValues]; } /** -- GitLab