From faad739f974a0392ca73e4db03e5267edcc5dec7 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 4 Nov 2020 17:51:17 +0200 Subject: [PATCH] Fix Trello import. Thanks to elct9620 and xet7 ! Fixes #3330 --- client/components/import/csvMembersMapper.js | 2 +- client/components/import/import.js | 12 ++++++------ client/components/import/trelloMembersMapper.js | 2 +- client/components/import/wekanMembersMapper.js | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/components/import/csvMembersMapper.js b/client/components/import/csvMembersMapper.js index cf8d58375..76d3366f7 100644 --- a/client/components/import/csvMembersMapper.js +++ b/client/components/import/csvMembersMapper.js @@ -1,4 +1,4 @@ -export function getMembersToMap(data) { +export function csvGetMembersToMap(data) { // we will work on the list itself (an ordered array of objects) when a // mapping is done, we add a 'wekan' field to the object representing the // imported member diff --git a/client/components/import/import.js b/client/components/import/import.js index 673900fd5..03afb69b7 100644 --- a/client/components/import/import.js +++ b/client/components/import/import.js @@ -1,6 +1,6 @@ -import trelloMembersMapper from './trelloMembersMapper'; -import wekanMembersMapper from './wekanMembersMapper'; -import csvMembersMapper from './csvMembersMapper'; +import { trelloGetMembersToMap } from './trelloMembersMapper'; +import { wekanGetMembersToMap } from './wekanMembersMapper'; +import { csvGetMembersToMap } from './csvMembersMapper'; const Papa = require('papaparse'); @@ -99,13 +99,13 @@ BlazeComponent.extendComponent({ let membersToMap; switch (importSource) { case 'trello': - membersToMap = trelloMembersMapper.getMembersToMap(dataObject); + membersToMap = trelloGetMembersToMap(dataObject); break; case 'wekan': - membersToMap = wekanMembersMapper.getMembersToMap(dataObject); + membersToMap = wekanGetMembersToMap(dataObject); break; case 'csv': - membersToMap = csvMembersMapper.getMembersToMap(dataObject); + membersToMap = csvGetMembersToMap(dataObject); break; } return membersToMap; diff --git a/client/components/import/trelloMembersMapper.js b/client/components/import/trelloMembersMapper.js index b5d59d931..9e72a698d 100644 --- a/client/components/import/trelloMembersMapper.js +++ b/client/components/import/trelloMembersMapper.js @@ -1,4 +1,4 @@ -export function getMembersToMap(data) { +export function trelloGetMembersToMap(data) { // we will work on the list itself (an ordered array of objects) when a // mapping is done, we add a 'wekan' field to the object representing the // imported member diff --git a/client/components/import/wekanMembersMapper.js b/client/components/import/wekanMembersMapper.js index 8db3aacd7..66b11bea4 100644 --- a/client/components/import/wekanMembersMapper.js +++ b/client/components/import/wekanMembersMapper.js @@ -1,4 +1,4 @@ -export function getMembersToMap(data) { +export function wekanGetMembersToMap(data) { // we will work on the list itself (an ordered array of objects) when a // mapping is done, we add a 'wekan' field to the object representing the // imported member