From 824b1f6874f8e3fbfc58cd7fd8ecf7ea77a3e500 Mon Sep 17 00:00:00 2001 From: Johannes Hoermann <j.hoermann@adito.de> Date: Thu, 22 Aug 2019 09:34:35 +0200 Subject: [PATCH] fix productprice --- entity/Productprice_entity/Productprice_entity.aod | 2 -- entity/Productprice_entity/afterOperatingState.js | 9 --------- .../entityfields/productpriceid/valueProcess.js | 7 ------- .../recordcontainers/db/conditionProcess.js | 2 +- 4 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 entity/Productprice_entity/afterOperatingState.js delete mode 100644 entity/Productprice_entity/entityfields/productpriceid/valueProcess.js diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod index 7f12819dac5..f7678ec46b2 100644 --- a/entity/Productprice_entity/Productprice_entity.aod +++ b/entity/Productprice_entity/Productprice_entity.aod @@ -9,7 +9,6 @@ <element>Product_entity</element> </siblings> <onValidation>%aditoprj%/entity/Productprice_entity/onValidation.js</onValidation> - <afterOperatingState>%aditoprj%/entity/Productprice_entity/afterOperatingState.js</afterOperatingState> <titlePlural>Prices</titlePlural> <recordContainer>db</recordContainer> <entityFields> @@ -51,7 +50,6 @@ </entityField> <entityField> <name>PRODUCTPRICEID</name> - <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/productpriceid/valueProcess.js</valueProcess> </entityField> <entityField> <name>PRODUCT_ID</name> diff --git a/entity/Productprice_entity/afterOperatingState.js b/entity/Productprice_entity/afterOperatingState.js deleted file mode 100644 index 3a2be077156..00000000000 --- a/entity/Productprice_entity/afterOperatingState.js +++ /dev/null @@ -1,9 +0,0 @@ -import("system.neon"); -import("system.vars"); - -if(vars.exists("$sys.operatingstate") - && vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_VIEW - && vars.get("$local.value")) // local.value is previous operationgstate or null. This fixes not working Filter -{ - neon.refresh(); -} diff --git a/entity/Productprice_entity/entityfields/productpriceid/valueProcess.js b/entity/Productprice_entity/entityfields/productpriceid/valueProcess.js deleted file mode 100644 index 86ef789e064..00000000000 --- a/entity/Productprice_entity/entityfields/productpriceid/valueProcess.js +++ /dev/null @@ -1,7 +0,0 @@ -import("system.util"); -import("system.vars"); -import("system.result"); -import("system.neon"); - -if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) - result.string(util.getNewUUID()); \ No newline at end of file diff --git a/entity/Productprice_entity/recordcontainers/db/conditionProcess.js b/entity/Productprice_entity/recordcontainers/db/conditionProcess.js index 6dfa481d296..afe510318a1 100644 --- a/entity/Productprice_entity/recordcontainers/db/conditionProcess.js +++ b/entity/Productprice_entity/recordcontainers/db/conditionProcess.js @@ -6,6 +6,6 @@ import("Sql_lib"); var cond = SqlCondition.begin() .andPrepareVars("PRODUCTPRICE.PRODUCT_ID", "$param.ProductId_param") .andPrepareVars("PRODUCTPRICE.CONTACT_ID", "$param.ContactId_param"); - + //TODO: use a preparedCondition when available #1030812 #1034026 result.string(db.translateCondition(cond.build("1 = 1"))); \ No newline at end of file -- GitLab