diff --git a/entity/Activity_entity/entityfields/direction/displayValueProcess.js b/entity/Activity_entity/entityfields/direction/displayValueProcess.js index b0340b349656800be7e78be41cd35c7e39f2cd08..db0eefa7c09b3968b41810ad94bc54cdbdff1cef 100644 --- a/entity/Activity_entity/entityfields/direction/displayValueProcess.js +++ b/entity/Activity_entity/entityfields/direction/displayValueProcess.js @@ -3,9 +3,4 @@ import("system.vars"); import("KeywordRegistry_basic"); import("Keyword_lib"); -var key = vars.get("$this.value"); -var res = ""; -if (key) - res = KeywordUtils.getViewValue($KeywordRegistry.activityDirection(), key); - -result.string(res); \ No newline at end of file +result.string(KeywordUtils.getViewValue($KeywordRegistry.activityDirection(), vars.get("$this.value"))); \ No newline at end of file diff --git a/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_entry_id/valueProcess.js b/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_entry_id/valueProcess.js index 1cacf4fccb58c3e2e610112acb3e4d0cfa888ea1..1a9583c3606aa16cd8ffc3564cbe8b64398c98a9 100644 --- a/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_entry_id/valueProcess.js +++ b/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_entry_id/valueProcess.js @@ -3,6 +3,6 @@ import("system.result"); import("system.neon"); import("system.vars"); -var keywordEntryId = vars.get("$param.keywordEntryId_param"); +var keywordEntryId = vars.get("$param.KeywordEntryId_param"); if(keywordEntryId && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) result.string(keywordEntryId); \ No newline at end of file diff --git a/entity/KeywordAttributeRelation_entity/entityfields/containername_param/valueProcess.js b/entity/KeywordAttributeRelation_entity/entityfields/containername_param/valueProcess.js index 9b0d81d5448db545f58206e9298bfd1c51335cfb..44f180a7780f7bf5615cdd0ecac7f8d619d732de 100644 --- a/entity/KeywordAttributeRelation_entity/entityfields/containername_param/valueProcess.js +++ b/entity/KeywordAttributeRelation_entity/entityfields/containername_param/valueProcess.js @@ -3,7 +3,7 @@ import("system.result"); import("system.vars"); import("Sql_lib"); -var entryId = vars.get("$param.keywordEntryId_param"); +var entryId = vars.get("$param.KeywordEntryId_param"); var containerName = db.cell(SqlCondition.begin().andPrepare("AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID", entryId) .buildSql("select AB_KEYWORD_ENTRY.CONTAINER from AB_KEYWORD_ENTRY")); diff --git a/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/containername_param/valueProcess.js b/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/containername_param/valueProcess.js index 3a71fd3b9c15160f718ce2bb30928efdbf35ea80..ae299547c91d87dff7a48285cd1a2eeee2ea9433 100644 --- a/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/containername_param/valueProcess.js +++ b/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/containername_param/valueProcess.js @@ -1,4 +1,4 @@ import("system.vars"); import("system.result"); -result.string(vars.get("$param.containerName_param")); +result.string(vars.get("$param.ContainerName_param")); diff --git a/entity/KeywordAttributeRelation_entity/recordcontainers/db/conditionProcess.js b/entity/KeywordAttributeRelation_entity/recordcontainers/db/conditionProcess.js index 3654d2b4d8f92c9aedc0514dc558cadc4bdbe9e6..e2f841acfe7f97a2016315b533ec3eaae47a5927 100644 --- a/entity/KeywordAttributeRelation_entity/recordcontainers/db/conditionProcess.js +++ b/entity/KeywordAttributeRelation_entity/recordcontainers/db/conditionProcess.js @@ -4,6 +4,6 @@ import("system.vars"); import("system.result"); import("Sql_lib"); -var cond = SqlCondition.begin().andPrepareVars("AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ENTRY_ID", "$param.keywordEntryId_param"); +var cond = SqlCondition.begin().andPrepareVars("AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ENTRY_ID", "$param.KeywordEntryId_param"); var condStr = db.translateCondition(cond.build("1 = 2")); result.string(condStr); \ No newline at end of file diff --git a/entity/KeywordAttribute_entity/recordcontainers/db/conditionProcess.js b/entity/KeywordAttribute_entity/recordcontainers/db/conditionProcess.js index 3d1602c7ef941c6fd534533fcf4d21c58b96d879..02735856728916d8c1030268da36120a4b8c16c3 100644 --- a/entity/KeywordAttribute_entity/recordcontainers/db/conditionProcess.js +++ b/entity/KeywordAttribute_entity/recordcontainers/db/conditionProcess.js @@ -3,10 +3,10 @@ import("system.db"); import("system.result"); import("Sql_lib"); -var cond = SqlCondition.begin().andPrepareVars("AB_KEYWORD_ATTRIBUTE.CONTAINER", "$param.containerName_param"); +var cond = SqlCondition.begin().andPrepareVars("AB_KEYWORD_ATTRIBUTE.CONTAINER", "$param.ContainerName_param"); //filter for entries that are already used by entry_id -var entryIdForFilter = vars.get("$param.filterAlreadyUsedByEntryId_param"); +var entryIdForFilter = vars.get("$param.FilterAlreadyUsedByEntryId_param"); if (entryIdForFilter) { var exclusiveFilterCondition = SqlCondition.begin() diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod index 8044f15802f1ab110c217cce0b49c51bf35876ba..37c1825aed2268030c46a2328d9e0c155bac0190 100644 --- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod +++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod @@ -402,7 +402,7 @@ </dependency> <children> <entityParameter> - <name>keywordEntryId_param</name> + <name>KeywordEntryId_param</name> <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelations/children/keywordentryid_param/valueProcess.js</valueProcess> </entityParameter> </children> diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js index b938e83c265a80b1c9eb9920e94561bb24d64a14..273862a3072e83e7c6d7645f5ba060890b9e7b32 100644 --- a/process/Keyword_lib/process.js +++ b/process/Keyword_lib/process.js @@ -44,6 +44,9 @@ KeywordUtils.getResolvedTitleSqlPart = function(pContainerName, pDbFieldName, pL */ KeywordUtils.getViewValue = function(keywordContainer, key) { + if (!key) + return ""; + var sql = SqlCondition.begin() .andPrepare("AB_KEYWORD_ENTRY.CONTAINER", keywordContainer) .andPrepare("AB_KEYWORD_ENTRY.KEYID", key)