mirror of
https://github.com/wekan/wekan.git
synced 2025-12-17 07:50:12 +01:00
Merge pull request #3458 from jrsupplee/issue-2924
Issue 2924: Rules not copied during board copy
This commit is contained in:
commit
1971037049
4 changed files with 80 additions and 8 deletions
|
|
@ -124,9 +124,13 @@ BlazeComponent.extendComponent({
|
||||||
},
|
},
|
||||||
'click .js-clone-board'(evt) {
|
'click .js-clone-board'(evt) {
|
||||||
Meteor.call(
|
Meteor.call(
|
||||||
'cloneBoard',
|
'copyBoard',
|
||||||
this.currentData()._id,
|
this.currentData()._id,
|
||||||
Session.get('fromBoard'),
|
{
|
||||||
|
sort: Boards.find({ archived: false }).count(),
|
||||||
|
type: 'board',
|
||||||
|
title: Boards.findOne(this.currentData()._id).copyTitle(),
|
||||||
|
},
|
||||||
(err, res) => {
|
(err, res) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
this.setError(err.error);
|
this.setError(err.error);
|
||||||
|
|
|
||||||
|
|
@ -675,12 +675,18 @@ BlazeComponent.extendComponent({
|
||||||
element.type = 'swimlane';
|
element.type = 'swimlane';
|
||||||
_id = element.copy(this.boardId);
|
_id = element.copy(this.boardId);
|
||||||
} else if (this.isBoardTemplateSearch) {
|
} else if (this.isBoardTemplateSearch) {
|
||||||
board = Boards.findOne(element.linkedId);
|
Meteor.call(
|
||||||
board.sort = Boards.find({ archived: false }).count();
|
'copyBoard',
|
||||||
board.type = 'board';
|
element.linkedId,
|
||||||
board.title = element.title;
|
{
|
||||||
delete board.slug;
|
sort: Boards.find({ archived: false }).count(),
|
||||||
_id = board.copy();
|
type: 'board',
|
||||||
|
title: element.title,
|
||||||
|
},
|
||||||
|
(err, data) => {
|
||||||
|
_id = data;
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
Popup.close();
|
Popup.close();
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -508,6 +508,7 @@ Boards.helpers({
|
||||||
copy() {
|
copy() {
|
||||||
const oldId = this._id;
|
const oldId = this._id;
|
||||||
delete this._id;
|
delete this._id;
|
||||||
|
delete this.slug;
|
||||||
const _id = Boards.insert(this);
|
const _id = Boards.insert(this);
|
||||||
|
|
||||||
// Copy all swimlanes in board
|
// Copy all swimlanes in board
|
||||||
|
|
@ -537,7 +538,52 @@ Boards.helpers({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// copy rules, actions, and triggers
|
||||||
|
const actionsMap = {};
|
||||||
|
Actions.find({ boardId: oldId }).forEach(action => {
|
||||||
|
const id = action._id;
|
||||||
|
delete action._id;
|
||||||
|
action.boardId = _id;
|
||||||
|
actionsMap[id] = Actions.insert(action);
|
||||||
|
});
|
||||||
|
const triggersMap = {};
|
||||||
|
Triggers.find({ boardId: oldId }).forEach(trigger => {
|
||||||
|
const id = trigger._id;
|
||||||
|
delete trigger._id;
|
||||||
|
trigger.boardId = _id;
|
||||||
|
triggersMap[id] = Triggers.insert(trigger);
|
||||||
|
});
|
||||||
|
Rules.find({ boardId: oldId }).forEach(rule => {
|
||||||
|
delete rule._id;
|
||||||
|
rule.boardId = _id;
|
||||||
|
rule.actionId = actionsMap[rule.actionId];
|
||||||
|
rule.triggerId = triggersMap[rule.triggerId];
|
||||||
|
Rules.insert(rule);
|
||||||
|
});
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Return a unique title based on the current title
|
||||||
|
*
|
||||||
|
* @returns {string|null}
|
||||||
|
*/
|
||||||
|
copyTitle() {
|
||||||
|
const m = this.title.match(/^(?<title>.*?)\s*(\[(?<num>\d+)]\s*$|\s*$)/);
|
||||||
|
const title = m.groups.title;
|
||||||
|
let num = 0;
|
||||||
|
Boards.find({ title: new RegExp(`^${title}\\s*\\[\\d+]\\s*$`) }).forEach(
|
||||||
|
board => {
|
||||||
|
const m = board.title.match(/^(?<title>.*?)\s*\[(?<num>\d+)]\s*$/);
|
||||||
|
if (m) {
|
||||||
|
const n = parseInt(m.groups.num, 10);
|
||||||
|
num = num < n ? n : num;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
return `${title} [${num + 1}]`;
|
||||||
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Is supplied user authorized to view this board?
|
* Is supplied user authorized to view this board?
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -209,3 +209,19 @@ Meteor.publishRelations('board', function(boardId, isArchived) {
|
||||||
|
|
||||||
return this.ready();
|
return this.ready();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Meteor.methods({
|
||||||
|
copyBoard(boardId, properties) {
|
||||||
|
check(boardId, String);
|
||||||
|
check(properties, Object);
|
||||||
|
|
||||||
|
const board = Boards.findOne(boardId);
|
||||||
|
if (board) {
|
||||||
|
for (const key in properties) {
|
||||||
|
board[key] = properties[key];
|
||||||
|
}
|
||||||
|
return board.copy();
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue