Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-02 06:31:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/edge' into devel

Browse source
This commit is contained in:
Lauri Ojansivu 2018-11-08 23:18:10 +02:00
commit 717891bee9
84 changed files with 1312 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
models/boards.js
View file

@ -127,9 +127,11 @@ Boards.attachSchema(new SimpleSchema({
},
'members.$.isNoComments': {
type: Boolean,
optional: true,
},
'members.$.isCommentOnly': {
type: Boolean,
optional: true,
},
permission: {
type: String,

10
models/import.js
View file

@ -3,10 +3,10 @@ import { WekanCreator } from './wekanCreator';
Meteor.methods({
importBoard(board, data, importSource, currentBoard) {
check(board, Object);
check(data, Object);
check(importSource, String);
check(currentBoard, Match.Maybe(String));
//check(board, Object);
//check(data, Object);
//check(importSource, String);
//check(currentBoard, Match.Maybe(String));
let creator;
switch (importSource) {
case 'trello':
@ -18,7 +18,7 @@ Meteor.methods({
}
// 1. check all parameters are ok from a syntax point of view
creator.check(board);
//creator.check(board);
// 2. check parameters are ok from a business point of view (exist &
// authorized) nothing to check, everyone can import boards in their account

39
models/wekanCreator.js
View file

@ -40,6 +40,8 @@ export class WekanCreator {
this.checklistItems = {};
// The comments, indexed by Wekan card id (to map when importing cards)
this.comments = {};
// Map of rules Wekan ID => Wekan ID
this.rules = {};
// the members, indexed by Wekan member id => Wekan user ID
this.members = data.membersMapping ? data.membersMapping : {};
// Map of triggers Wekan ID => Wekan ID
@ -748,24 +750,25 @@ export class WekanCreator {
}
check(board) {
try {
// check(data, {
// membersMapping: Match.Optional(Object),
// });
this.checkActivities(board.activities);
this.checkBoard(board);
this.checkLabels(board.labels);
this.checkLists(board.lists);
this.checkSwimlanes(board.swimlanes);
this.checkCards(board.cards);
this.checkChecklists(board.checklists);
this.checkRules(board.rules);
this.checkActions(board.actions);
this.checkTriggers(board.triggers);
this.checkChecklistItems(board.checklistItems);
} catch (e) {
throw new Meteor.Error('error-json-schema');
}
//try {
// check(data, {
// membersMapping: Match.Optional(Object),
// });
// this.checkActivities(board.activities);
// this.checkBoard(board);
// this.checkLabels(board.labels);
// this.checkLists(board.lists);
// this.checkSwimlanes(board.swimlanes);
// this.checkCards(board.cards);
//this.checkChecklists(board.checklists);
// this.checkRules(board.rules);
// this.checkActions(board.actions);
//this.checkTriggers(board.triggers);
//this.checkChecklistItems(board.checklistItems);
//} catch (e) {
// throw new Meteor.Error('error-json-schema');
// }
}
create(board, currentBoardId) {