mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-11-10 14:44:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🔀 Merge branch 'master' into oauth-support

Browse source
This commit is contained in:
Jan Oberhauser 2020-05-31 19:38:30 +02:00
parent 4cd1d902e3 ce7bc08963
commit 4684e32375
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/nodes-base/nodes/Zulip/StreamDescription.ts
View file

@ -33,11 +33,11 @@ export const streamOperations = [
value: 'getSubscribed',
description: 'Get subscribed streams.',
},
// {
// name: 'Update',
// value: 'update',
// description: 'Update a stream.',
// },
{
name: 'Update',
value: 'update',
description: 'Update a stream.',
},
],
default: 'create',
description: 'The operation to perform.',

10
packages/nodes-base/nodes/Zulip/UserDescription.ts
View file

@ -33,11 +33,11 @@ export const userOperations = [
value: 'getAll',
description: 'Get all users.',
},
// {
// name: 'Update',
// value: 'update',
// description: 'Update a user.',
// },
{
name: 'Update',
value: 'update',
description: 'Update a user.',
},
],
default: 'create',
description: 'The operation to perform.',

12
packages/nodes-base/nodes/Zulip/Zulip.node.ts
View file

@ -263,16 +263,16 @@ export class Zulip implements INodeType {
if (operation === 'create') {
const jsonParameters = this.getNodeParameter('jsonParameters', i) as boolean;
const subscriptions = this.getNodeParameter('subscriptions', i) as IDataObject;
body.subscriptions = JSON.stringify(subscriptions.properties);
if (jsonParameters) {
const additionalFieldsJson = this.getNodeParameter('additionalFieldsJson', i) as string;
if (additionalFieldsJson !== '') {
if (validateJSON(additionalFieldsJson) !== undefined) {
Object.assign(body, JSON.parse(additionalFieldsJson));
} else {
throw new Error('Additional fields must be a valid JSON');
}
@ -342,10 +342,10 @@ export class Zulip implements INodeType {
const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
if (additionalFields.description) {
body.description = additionalFields.description as string;
body.description = JSON.stringify(additionalFields.description as string);
}
if (additionalFields.newName) {
body.new_name = additionalFields.newName as string;
body.new_name = JSON.stringify(additionalFields.newName as string);
}
if (additionalFields.isPrivate) {
body.is_private = additionalFields.isPrivate as boolean;
@ -412,7 +412,7 @@ export class Zulip implements INodeType {
const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
if (additionalFields.fullName) {
body.full_name = additionalFields.fullName as string;
body.full_name = JSON.stringify(additionalFields.fullName as string);
}
if (additionalFields.isAdmin) {
body.is_admin = additionalFields.isAdmin as boolean;