diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index ea6aa21dbd64b2e0d9b401efd879ad2ffcf0eb3f..8bd2d5bfe361486d888545be13b09e131401bfc4 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -33,15 +33,15 @@
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/object_type/valueProcess.js</valueProcess>
</entityField>
<entityField>
- <name>ATTRIBUTERELATION_VALUE</name>
+ <name>valueProxy</name>
<title>Value</title>
- <contentTypeProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/contentTypeProcess.js</contentTypeProcess>
+ <contentTypeProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js</contentTypeProcess>
<resolution>DAY</resolution>
<mandatory v="true" />
- <possibleItemsProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/possibleItemsProcess.js</possibleItemsProcess>
- <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/onValueChange.js</onValueChange>
+ <possibleItemsProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/possibleItemsProcess.js</possibleItemsProcess>
+ <valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/AttributeRelation_entity/entityfields/valueproxy/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>CHAR_VALUE</name>
diff --git a/entity/AttributeRelation_entity/entityfields/attributerelation_value/contentTypeProcess.js b/entity/AttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js
similarity index 100%
rename from entity/AttributeRelation_entity/entityfields/attributerelation_value/contentTypeProcess.js
rename to entity/AttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js
diff --git a/entity/AttributeRelation_entity/entityfields/attributerelation_value/displayValueProcess.js b/entity/AttributeRelation_entity/entityfields/valueproxy/displayValueProcess.js
similarity index 93%
rename from entity/AttributeRelation_entity/entityfields/attributerelation_value/displayValueProcess.js
rename to entity/AttributeRelation_entity/entityfields/valueproxy/displayValueProcess.js
index 722aed0f3fa84a3e329414c97774338b51543cfa..c2cd0971b53da78645efc3ea3db900d49d9d412a 100644
--- a/entity/AttributeRelation_entity/entityfields/attributerelation_value/displayValueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/valueproxy/displayValueProcess.js
@@ -21,6 +21,6 @@ else if (attrType == $AttributeTypes.KEYWORD)
}
else
- value = vars.get("$field.ATTRIBUTERELATION_VALUE");
+ value = vars.get("$field.valueProxy");
result.string(value);
diff --git a/entity/AttributeRelation_entity/entityfields/attributerelation_value/onValueChange.js b/entity/AttributeRelation_entity/entityfields/valueproxy/onValueChange.js
similarity index 69%
rename from entity/AttributeRelation_entity/entityfields/attributerelation_value/onValueChange.js
rename to entity/AttributeRelation_entity/entityfields/valueproxy/onValueChange.js
index eabe5d10fc826c776508103bbf7c4bddc466a516..ec2f10e7054b84b619e524fd7e39529b4e449833 100644
--- a/entity/AttributeRelation_entity/entityfields/attributerelation_value/onValueChange.js
+++ b/entity/AttributeRelation_entity/entityfields/valueproxy/onValueChange.js
@@ -2,7 +2,7 @@ import("system.vars");
import("Entity_lib");
import("Attribute_lib");
-var attrValue = vars.exists("$field.ATTRIBUTERELATION_VALUE") ? vars.get("$field.ATTRIBUTERELATION_VALUE") : "";
+var attrValue = vars.exists("$field.valueProxy") ? vars.get("$field.valueProxy") : "";
attrValue = ProcessHandlingUtils.getOnValidationValue(attrValue);
var attribute = AttributeHandler.begin(vars.get("$field.AB_ATTRIBUTE_ID"));
diff --git a/entity/AttributeRelation_entity/entityfields/attributerelation_value/possibleItemsProcess.js b/entity/AttributeRelation_entity/entityfields/valueproxy/possibleItemsProcess.js
similarity index 90%
rename from entity/AttributeRelation_entity/entityfields/attributerelation_value/possibleItemsProcess.js
rename to entity/AttributeRelation_entity/entityfields/valueproxy/possibleItemsProcess.js
index 60c66562b7714341cc539f5afb7d43c49b4105c9..779fd24fa971d879920b3238f61f82c348071415 100644
--- a/entity/AttributeRelation_entity/entityfields/attributerelation_value/possibleItemsProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/valueproxy/possibleItemsProcess.js
@@ -17,6 +17,13 @@ if (attrType == $AttributeTypes.COMBO)
var valueList = db.table(valueSql);
result.object(valueList);
}
+else if (attrType == $AttributeTypes.BOOLEAN)
+{
+ result.object([
+ ["1", translate.text("Yes")],
+ ["0", translate.text("No")]
+ ]);
+}
//TODO this is a workaround for keywords, when it's possible to use the consumer remove this
else if (attrType == $AttributeTypes.KEYWORD)
@@ -34,4 +41,4 @@ else if (attrType == $AttributeTypes.KEYWORD)
return [row[0], translate.text(row[1])];
});
result.object(keywords);
-}
+}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js b/entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js
similarity index 100%
rename from entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js
rename to entity/AttributeRelation_entity/entityfields/valueproxy/valueProcess.js
diff --git a/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js b/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js
index beaaa08c35beeb077df7f67ebf1671858d2daf15..eed48d6bc1c8b5253f3c6d29e6923253a1f6df90 100644
--- a/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js
@@ -4,10 +4,9 @@ import("system.result");
import("Attribute_lib");
var fieldState;
-if (vars.get("$field.ATTRIBUTE_TYPE") == $AttributeTypes.KEYWORD)
+if (vars.get("$field.ATTRIBUTE_TYPE") == $AttributeTypes.KEYWORD || true) //TODO use the correct condition when updating the state is possible
fieldState = neon.COMPONENTSTATE_AUTO;
else
fieldState = neon.COMPONENTSTATE_INVISIBLE;
-//TODO result the correct state here when updating the state is possible
-result.string(neon.COMPONENTSTATE_AUTO);//result.string(fieldState);
\ No newline at end of file
+result.string(fieldState);
\ No newline at end of file
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index 3a6092508cf2ac9c9a816854dbb419aa9b07a618..37c88b676b90aa55ce875b420bdf2f91211b93aa 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -23,6 +23,12 @@
<title>Medium</title>
<consumer>KeywordMedium</consumer>
<mandatory v="true" />
+ <onValueChange>%aditoprj%/entity/Communication_entity/entityfields/medium_id/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ <element>RECORD</element>
+ </onValueChangeTypes>
</entityField>
<entityField>
<name>CONTACT_ID</name>
diff --git a/entity/Communication_entity/entityfields/medium_id/onValueChange.js b/entity/Communication_entity/entityfields/medium_id/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..cb592a48f0bdac70740ca19a55b22dfbadf77acc
--- /dev/null
+++ b/entity/Communication_entity/entityfields/medium_id/onValueChange.js
@@ -0,0 +1,8 @@
+import("system.neon");
+import("system.vars");
+import("Entity_lib");
+
+var mediumId = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.MEDIUM_ID"));
+
+if (mediumId == "d08956b8-369e-4b65-88fa-1c37b3368ae3" && vars.get("$field.ADDR") == "") //medium == Internet
+ neon.setFieldValue("$field.ADDR", "https://");
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 17fba221bd029b4c9bee3d1c718b39bb15d590ff..e9e43d8f824ffcdc23882df45ff79d0b83be5666 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -411,14 +411,14 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>STANDARD_EMAIL_COMMUNICATION</name>
<title>E-Mail</title>
<consumer>EmailCommunications</consumer>
- <searchable v="false" />
+ <searchable v="true" />
<onValueChange>%aditoprj%/entity/Person_entity/entityfields/standard_email_communication/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>STANDARD_PHONE_COMMUNICATION</name>
<title>Phone</title>
<consumer>PhoneCommunications</consumer>
- <searchable v="false" />
+ <searchable v="true" />
<onValueChange>%aditoprj%/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js</onValueChange>
</entityField>
<entityConsumer>
diff --git a/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod b/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod
index b4c8d4ad85db22baaa90965b82fac2e75f090642..4efbd08f92a2d2c18e136462bb1a5c4eba923ddf 100644
--- a/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod
+++ b/neonView/AttributeRelationEdit_view/AttributeRelationEdit_view.aod
@@ -18,7 +18,7 @@
</neonTableColumn>
<neonTableColumn>
<name>04dda499-d970-41d1-a524-5e354c0d2bfd</name>
- <entityField>ATTRIBUTERELATION_VALUE</entityField>
+ <entityField>valueProxy</entityField>
</neonTableColumn>
</columns>
</genericMultipleViewTemplate>
diff --git a/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod b/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
index 8943bfa0c50cbef9a0e813a1d52d58e43dc4088b..4af75c78d41b0401670df10fb650ecc7d0d8aa63 100644
--- a/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
+++ b/neonView/AttributeRelationFilter_view/AttributeRelationFilter_view.aod
@@ -21,7 +21,7 @@
</neonTableColumn>
<neonTableColumn>
<name>83a10d52-9eaf-4901-935e-2a7410831861</name>
- <entityField>ATTRIBUTERELATION_VALUE</entityField>
+ <entityField>valueProxy</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
diff --git a/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod b/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
index 41ed1f745ebc495d92c4b4cc9c0006764e5e90de..2429f48f5b7cfd2fc79af5fbc25a7940323ceb1b 100644
--- a/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
+++ b/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
@@ -18,7 +18,7 @@
</neonTableColumn>
<neonTableColumn>
<name>a4661c55-6e51-4884-b460-0ef1dca7c5f7</name>
- <entityField>ATTRIBUTERELATION_VALUE</entityField>
+ <entityField>valueProxy</entityField>
</neonTableColumn>
</columns>
</titledListViewTemplate>