diff --git a/entity/DistrictChangeValidityDates_entity/onValidation.js b/entity/DistrictChangeValidityDates_entity/onValidation.js index 11ff32f6ed97d0f204bf0bc4c368bf38317aa0c3..ece25072947b140d07ecb0a771aa190cef9cebef 100644 --- a/entity/DistrictChangeValidityDates_entity/onValidation.js +++ b/entity/DistrictChangeValidityDates_entity/onValidation.js @@ -1,8 +1,9 @@ +import("system.translate"); import("system.result"); import("system.vars"); var count = vars.get("$field.count"); if(count == 0) { - result.string("No Datasets selected"); + result.string(translate.text("No Datasets selected")); } \ No newline at end of file diff --git a/entity/DistrictContact_entity/entityfields/filterviewactiongroup/children/changevalidity/onActionProcess.js b/entity/DistrictContact_entity/entityfields/filterviewactiongroup/children/changevalidity/onActionProcess.js index 1ba1dceffbacbc53b63b0fe55412dd2b9d4f2da2..756059093ddcae5d7471939e45d69125a8dd843e 100644 --- a/entity/DistrictContact_entity/entityfields/filterviewactiongroup/children/changevalidity/onActionProcess.js +++ b/entity/DistrictContact_entity/entityfields/filterviewactiongroup/children/changevalidity/onActionProcess.js @@ -8,7 +8,7 @@ import("system.vars"); var districtContactIds; var currentContext = ContextUtils.getCurrentContextId(); -if (vars.get("$sys.selection").length > 0) +if (vars.get("$sys.selection") && vars.get("$sys.selection").length > 0) { districtContactIds = vars.get("$sys.selection"); } diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index 67be8881b31fd68fbe2bf635563d99407c773be1..70ce017c7dd5116dadae59ac39e2e09f9826eb92 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -299,6 +299,10 @@ <key>Fullfilled</key> <value>erledigt</value> </entry> + <entry> + <key>No Datasets selected</key> + <value>Keine Datensätze ausgewählt</value> + </entry> <entry> <key>A Phase filter has to be set when creating a checklistentry for the Salesproject Context.</key> <value>Es muss ein Filter auf die Phase gesetzt werden wenn der VertriebsprojektKontext ausgewählt ist.</value> diff --git a/process/FilterViewAction_lib/process.js b/process/FilterViewAction_lib/process.js index f79e4d3d548b181bf63dd9098ca8584d5db05c81..2ceb9bfc1fe2fdb55cc77020ed1fed08a79ed32a 100644 --- a/process/FilterViewAction_lib/process.js +++ b/process/FilterViewAction_lib/process.js @@ -71,12 +71,12 @@ FilterViewActionUtils.getUidsByEntityFilter = function (pContext, pFilter, pPara .entity(ContextUtils.getEntity(pContext)) .fields(["#UID"]); - if (Utils.isNullOrEmpty(pFilter.filter)) + if (!Utils.isNullOrEmpty(pFilter.filter)) { loadRowsConfig.filter(JSON.stringify(pFilter.filter)); } - if(Utils.isNullOrEmpty(pParameters)) + if(!Utils.isNullOrEmpty(pParameters)) { Object.keys(pParameters).forEach(function(key){ loadRowsConfig.addParameter(key, pParameters[key])