Skip to content
Snippets Groups Projects
Commit b3784e57 authored by Martin Groppe's avatar Martin Groppe
Browse files

fixed renamed columns in code

parent 9317d3ae
No related branches found
No related tags found
No related merge requests found
Showing
with 12 additions and 21 deletions
......@@ -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
......@@ -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
......@@ -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
{
......
......@@ -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>
......
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
......@@ -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"));
}
}
......@@ -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")
{
......
......@@ -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>
......
......@@ -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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment