diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js index ad28fee8a..8c45fbe28 100644 --- a/client/components/boards/boardsList.js +++ b/client/components/boards/boardsList.js @@ -67,7 +67,7 @@ BlazeComponent.extendComponent({ Utils.goBoardId(res); } } - ); + ); evt.preventDefault(); }, 'click .js-accept-invite'() { diff --git a/models/export.js b/models/export.js index d402efe38..49aac828d 100644 --- a/models/export.js +++ b/models/export.js @@ -30,7 +30,7 @@ if (Meteor.isServer) { } const exporter = new Exporter(boardId); - if (true||exporter.canExport(user)) { + if (exporter.canExport(user)) { JsonRoutes.sendResult(res, { code: 200, data: exporter.build(), diff --git a/models/import.js b/models/import.js index f70992827..ddc1a1d09 100644 --- a/models/import.js +++ b/models/import.js @@ -31,18 +31,17 @@ Meteor.methods({ }); Meteor.methods({ - cloneBoard(sourceBoardId,currentBoardId) { + cloneBoard(sourceBoardId, currentBoardId) { check(sourceBoardId, String); check(currentBoardId, Match.Maybe(String)); const exporter = new Exporter(sourceBoardId); - let data = exporter.build(); - let addData = {}; + const data = exporter.build(); + const addData = {}; addData.membersMapping = wekanMembersMapper.getMembersToMap(data); const creator = new WekanCreator(addData); - data.title = data.title + " - " + TAPi18n.__('copy-tag'); + data.title = `${data.title } - ${ TAPi18n.__('copy-tag')}`; return creator.create(data, currentBoardId); }, }); - diff --git a/models/wekanCreator.js b/models/wekanCreator.js index d0494a769..0f6a9d17b 100644 --- a/models/wekanCreator.js +++ b/models/wekanCreator.js @@ -173,25 +173,25 @@ export class WekanCreator { // 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 - const membersToMap = data.members; - const users = data.users; - // auto-map based on username - membersToMap.forEach((importedMember) => { - importedMember.id = importedMember.userId; - delete importedMember.userId; - const user = users.filter((user) => { - return user._id === importedMember.id; - })[0]; - if (user.profile && user.profile.fullname) { - importedMember.fullName = user.profile.fullname; - } - importedMember.username = user.username; - const wekanUser = Users.findOne({ username: importedMember.username }); - if (wekanUser) { - importedMember.wekanId = wekanUser._id; - } - }); - return membersToMap; + const membersToMap = data.members; + const users = data.users; + // auto-map based on username + membersToMap.forEach((importedMember) => { + importedMember.id = importedMember.userId; + delete importedMember.userId; + const user = users.filter((user) => { + return user._id === importedMember.id; + })[0]; + if (user.profile && user.profile.fullname) { + importedMember.fullName = user.profile.fullname; + } + importedMember.username = user.username; + const wekanUser = Users.findOne({ username: importedMember.username }); + if (wekanUser) { + importedMember.wekanId = wekanUser._id; + } + }); + return membersToMap; } checkActions(wekanActions) { diff --git a/server/rulesHelper.js b/server/rulesHelper.js index 4c8ec4fa4..197e3756f 100644 --- a/server/rulesHelper.js +++ b/server/rulesHelper.js @@ -141,7 +141,7 @@ RulesHelper = { Swimlanes.insert({ title: action.swimlaneName, boardId, - sort: 0 + sort: 0, }); } if(action.actionType === 'addChecklistWithItems'){