diff --git a/entity/BulkMailRecipient_entity/entityfields/testrunactions/children/removetestrecipient/onActionProcess.js b/entity/BulkMailRecipient_entity/entityfields/testrunactions/children/removetestrecipient/onActionProcess.js
index 96f7a462b0b5ee3055a61a0e94aa052c98284cc2..b19f093933f83c39b3bca1779f28b1a9240aacd3 100644
--- a/entity/BulkMailRecipient_entity/entityfields/testrunactions/children/removetestrecipient/onActionProcess.js
+++ b/entity/BulkMailRecipient_entity/entityfields/testrunactions/children/removetestrecipient/onActionProcess.js
@@ -3,7 +3,7 @@ import("system.vars");
import("system.neon");
newWhereIfSet("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", vars.get("$sys.selection"), SqlBuilder.IN())
- .updateData(true, "BULKMAILRECIPIENT", ["TEST_RECIPIENT"], null, [0]);
+ .updateData(true, "BULKMAILRECIPIENT", ["IS_TEST_RECIPIENT"], null, [0]);
neon.refreshAll();
\ No newline at end of file
diff --git a/entity/BulkMailRecipient_entity/entityfields/testrunactions/children/settestrecipient/onActionProcess.js b/entity/BulkMailRecipient_entity/entityfields/testrunactions/children/settestrecipient/onActionProcess.js
index bdcb19753beb5ba51544e473bb75f1636bc57df1..69f831c2f7a1a5dfca2708c9fbee266e552f6773 100644
--- a/entity/BulkMailRecipient_entity/entityfields/testrunactions/children/settestrecipient/onActionProcess.js
+++ b/entity/BulkMailRecipient_entity/entityfields/testrunactions/children/settestrecipient/onActionProcess.js
@@ -3,7 +3,7 @@ import("system.vars");
import("system.neon");
newWhereIfSet("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", vars.get("$sys.selection"), SqlBuilder.IN())
- .updateData(true, "BULKMAILRECIPIENT", ["TEST_RECIPIENT"], null, [1]);
+ .updateData(true, "BULKMAILRECIPIENT", ["IS_TEST_RECIPIENT"], null, [1]);
neon.refreshAll();
\ No newline at end of file
diff --git a/entity/BulkMailRecipient_entity/recordcontainers/db/conditionProcess.js b/entity/BulkMailRecipient_entity/recordcontainers/db/conditionProcess.js
index d8276054099ce68964cf52421a6db2fb5a9a2f6e..da5905dd40d05e6350fa2decc5da91f870a689f7 100644
--- a/entity/BulkMailRecipient_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/BulkMailRecipient_entity/recordcontainers/db/conditionProcess.js
@@ -14,7 +14,7 @@ var isTestMail = Utils.toBoolean(vars.get("$param.IsTestMail_param"));
var condition = newWhere("BULKMAILRECIPIENT.BULKMAIL_ID", "$param.BulkMailId_param");
if (isTestMail)
{
- condition.and("BULKMAILRECIPIENT.TEST_RECIPIENT", 1);
+ condition.and("BULKMAILRECIPIENT.IS_TEST_RECIPIENT", 1);
}
else
{
diff --git a/entity/Link_entity/Link_entity.aod b/entity/Link_entity/Link_entity.aod
index b44e8481e0478d5e7676c7a3defbd79c72047cc8..0c37357fc5c84c845bbdd0ca6027e94482b89500 100644
--- a/entity/Link_entity/Link_entity.aod
+++ b/entity/Link_entity/Link_entity.aod
@@ -20,7 +20,6 @@
</entityField>
<entityField>
<name>LINKID</name>
- <valueProcess>%aditoprj%/entity/Link_entity/entityfields/linkid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
@@ -128,11 +127,11 @@
<displayValueProcess>%aditoprj%/entity/Link_entity/entityfields/workflowprocessdefinition_key/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
- <name>REDIRECT</name>
+ <name>ISREDIRECT</name>
<title>Redirect</title>
<contentType>BOOLEAN</contentType>
- <stateProcess>%aditoprj%/entity/Link_entity/entityfields/redirect/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/Link_entity/entityfields/redirect/valueProcess.js</valueProcess>
+ <stateProcess>%aditoprj%/entity/Link_entity/entityfields/isredirect/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/Link_entity/entityfields/isredirect/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
@@ -193,8 +192,8 @@
<recordfield>LINK.WORKFLOWPROCESSDEFINITION_KEY</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>REDIRECT.value</name>
- <recordfield>LINK.REDIRECT</recordfield>
+ <name>ISREDIRECT.value</name>
+ <recordfield>LINK.ISREDIRECT</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
diff --git a/entity/Link_entity/entityfields/redirect/stateProcess.js b/entity/Link_entity/entityfields/isredirect/stateProcess.js
similarity index 100%
rename from entity/Link_entity/entityfields/redirect/stateProcess.js
rename to entity/Link_entity/entityfields/isredirect/stateProcess.js
diff --git a/entity/Link_entity/entityfields/redirect/valueProcess.js b/entity/Link_entity/entityfields/isredirect/valueProcess.js
similarity index 100%
rename from entity/Link_entity/entityfields/redirect/valueProcess.js
rename to entity/Link_entity/entityfields/isredirect/valueProcess.js
diff --git a/entity/Link_entity/entityfields/linkid/valueProcess.js b/entity/Link_entity/entityfields/linkid/valueProcess.js
deleted file mode 100644
index 10b4a4579d6d8a92317d218292c6eb9ee8a19223..0000000000000000000000000000000000000000
--- a/entity/Link_entity/entityfields/linkid/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("system.util");
-
-if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
- result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/Link_entity/entityfields/url/onValidation.js b/entity/Link_entity/entityfields/url/onValidation.js
index 7aa2aee48d841bc204fd8e411f05080b6f48f63e..b793c34df72b97d57f697cc126ec417b9268bee5 100644
--- a/entity/Link_entity/entityfields/url/onValidation.js
+++ b/entity/Link_entity/entityfields/url/onValidation.js
@@ -9,9 +9,8 @@ if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.get("$loc
if (newSelect("URL").from("LINK").where("LINK.URL", vars.get("$local.value")).cell())
result.string(translate.text("Url must be unique"));
- if (vars.get("$field.REDIRECT") == "1" && !/^(?:http(s)?:\/\/)[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+$/g.test(vars.get("$local.value")))
+ if (vars.get("$field.ISREDIRECT") == "1" && !/^(?:http(s)?:\/\/)[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+$/g.test(vars.get("$local.value")))
{
result.string(translate.text("Redirect needs a full Url with http/https"));
}
}
-
diff --git a/entity/Link_entity/entityfields/workflowprocessdefinition_key/stateProcess.js b/entity/Link_entity/entityfields/workflowprocessdefinition_key/stateProcess.js
index eb561bd32326d17f3b63cdfc10f0224d02d2d744..1fff90825831727043eeba5d780ed9e260b2ed48 100644
--- a/entity/Link_entity/entityfields/workflowprocessdefinition_key/stateProcess.js
+++ b/entity/Link_entity/entityfields/workflowprocessdefinition_key/stateProcess.js
@@ -4,7 +4,7 @@ import("KeywordRegistry_basic");
import("system.neon");
var linktype = vars.get("$field.LINKTYPE");
-var redirect = vars.get("$field.REDIRECT");
+var redirect = vars.get("$field.ISREDIRECT");
if (linktype == $KeywordRegistry.linkType$EMail() && redirect == "1")
{
diff --git a/neonView/LinkEdit_view/LinkEdit_view.aod b/neonView/LinkEdit_view/LinkEdit_view.aod
index 9ee5c3ecaf61f32c550ee9c7cde647331c970972..d579126cf9bf93cd1cd4d2b6841e86e96028826e 100644
--- a/neonView/LinkEdit_view/LinkEdit_view.aod
+++ b/neonView/LinkEdit_view/LinkEdit_view.aod
@@ -33,7 +33,7 @@
</entityFieldLink>
<entityFieldLink>
<name>2b22fb4a-5e7e-48ee-b6d1-3ee4381fb419</name>
- <entityField>REDIRECT</entityField>
+ <entityField>ISREDIRECT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>90ab2682-bc2d-4989-ab7b-b47045a3cbf3</name>
diff --git a/neonView/LinkPreview_view/LinkPreview_view.aod b/neonView/LinkPreview_view/LinkPreview_view.aod
index 5712a77d7f8ecb0b6650338cfcc6a69bed5ba8cd..d66569292917344222140aea55b7b9c0bbbe9c0d 100644
--- a/neonView/LinkPreview_view/LinkPreview_view.aod
+++ b/neonView/LinkPreview_view/LinkPreview_view.aod
@@ -30,7 +30,7 @@
</entityFieldLink>
<entityFieldLink>
<name>840b0f8d-763f-402d-b318-6317402a7c6c</name>
- <entityField>REDIRECT</entityField>
+ <entityField>ISREDIRECT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>a807f6b9-252c-4545-a2c9-266c64012097</name>