admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 10:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔀 Merge branch '139-null-returnValues' of https://github.com/airmoi/n8n into airmoi-139-null-returnValues

Browse Source
This commit is contained in:
Jan Oberhauser
2020-02-07 17:02:11 -08:00
parent 79f863b670 31af36b8bd
commit 3ed27c6485
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/workflow/src/Workflow.ts
View File

@@ -890,16 +890,16 @@ export class Workflow {
// Execute the expression // Execute the expression
try { try {
const returnValue = tmpl.tmpl(parameterValue, dataProxy.getDataProxy()); const returnValue = tmpl.tmpl(parameterValue, dataProxy.getDataProxy());
if (typeof returnValue === 'object' && Object.keys(returnValue).length === 0) { if (returnValue !== null && typeof returnValue === 'object') {
if (Object.keys(returnValue).length === 0) {
// When expression is incomplete it returns a Proxy which causes problems. // When expression is incomplete it returns a Proxy which causes problems.
// Catch it with this code and return a proper error. // Catch it with this code and return a proper error.
throw new Error('Expression is not valid.'); throw new Error('Expression is not valid.');
} }
if (returnObjectAsString === true) {
if (returnObjectAsString === true && typeof returnValue === 'object') {
return this.convertObjectValueToString(returnValue); return this.convertObjectValueToString(returnValue);
} }
}
return returnValue; return returnValue;
} catch (e) { } catch (e) {
throw new Error('Expression is not valid.'); throw new Error('Expression is not valid.');