Skip to content
Snippets Groups Projects
Commit 9270e623 authored by David Büchler's avatar David Büchler
Browse files

Merge remote-tracking branch 'origin/stable2019.3' into #1040035-Dublettenermittlung

parents 0b5a5de3 e1a6b7ae
No related branches found
No related tags found
No related merge requests found
### Set the default behavior for text files (lineendings will be converted by git)
* text=auto
### Declare files that will always have CRLF line endings on checkout (Example: windows bat file)
*.bat text eol=crlf
### Declare files that will always have LF line endings on checkout. (Example: linux .sh script)
*.sh text eol=lf
### Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary
*.jasper binary
\ No newline at end of file
......@@ -6,7 +6,7 @@ var links = [];
var orgId = vars.get("$field.ORGANISATION_ID")
if (orgId && orgId.trim() != "0")
links.push(["Organisation", vars.get("$field.ORGANISATION_ID")]);
links.push(["Organisation", vars.get("$field.ORGANISATION_CONTACTID")]);
links = JSON.stringify(links);
result.string(links);
\ No newline at end of file
......@@ -86,6 +86,8 @@ ContextUtils.getContextConsumer = function(pContextId)
return "CampaignSteps";
case ContextUtils.getContextName("PrivatePerson"):
return "PrivatePersons";
default:
throw new Error(translate.withArguments("No consumer found for context '%0'", [pContextId]));
}
}
......
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