diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod index 19cd75197be85fa49cad58cd153a5f9b7eca05f1..9afed77c7a49c26efd9a62489d6510611df0a31b 100644 --- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod +++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod @@ -7,7 +7,6 @@ <siblings> <element>Attribute_entity</element> </siblings> - <onValidation>%aditoprj%/entity/AttributeUsage_entity/onValidation.js</onValidation> <recordContainer>db</recordContainer> <entityFields> <entityProvider> diff --git a/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js b/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js index 0a2f0bdb56a56e509e8977dfd6e93d0eb02994c3..38fd4fbc26dea0c1560f7152e9c69ada8b141f3e 100644 --- a/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js +++ b/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js @@ -3,7 +3,8 @@ import("system.vars"); import("system.translate"); import("Entity_lib"); -var maxCount = vars.get("local.value"); +var minCount = vars.getString("$field.MIN_COUNT"); +var maxCount = vars.get("$local.value"); if (maxCount) { @@ -12,4 +13,7 @@ if (maxCount) result.string(translate.text("Maximal count must be one or higher")); else if (maxCount != Math.floor(maxCount)) result.string(translate.text("Maximal count has to be a whole number")); + else if (minCount && minCount > maxCount) + result.string(translate.text("The minimal count can't be larger than the maximal count!")); } + diff --git a/entity/AttributeUsage_entity/onValidation.js b/entity/AttributeUsage_entity/onValidation.js deleted file mode 100644 index f35c9b28c229e58d70a79ab48c80cb2b0cb14bfc..0000000000000000000000000000000000000000 --- a/entity/AttributeUsage_entity/onValidation.js +++ /dev/null @@ -1,8 +0,0 @@ -import("system.translate"); -import("system.vars"); -import("system.result"); - -var minCount = vars.getString("$field.MIN_COUNT"); -var maxCount = vars.getString("$field.MAX_COUNT"); -if (minCount != "" && maxCount != "" && minCount > maxCount) - result.string(translate.text("The minimal count can't be larger than the maximal count!")); \ No newline at end of file