Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-20 23:14:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Use sync code in allow/deny for 2.x

Browse source
This commit is contained in:
Harry Adel 2026-02-19 00:26:47 +02:00
parent f934aea2a5
commit e77be37450
28 changed files with 594 additions and 410 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/cronMigrationManager.js
View file

@ -1646,8 +1646,8 @@ class CronMigrationManager {
SyncedCron.add({
name: step.cronName,
schedule: (parser) => parser.text(step.schedule),
job: () => {
this.runMigrationStep(step);
job: async () => {
await this.runMigrationStep(step);
},
});
}

4
server/lib/utils.js
View file

@ -27,12 +27,12 @@ allowIsBoardMemberWithWriteAccess = function(userId, board) {
// Check if user has write access via a card's board
allowIsBoardMemberWithWriteAccessByCard = function(userId, card) {
const board = card && card.board && card.board();
const board = card && Boards.findOne(card.boardId);
return allowIsBoardMemberWithWriteAccess(userId, board);
};
allowIsBoardMemberByCard = function(userId, card) {
const board = card.board();
const board = card && Boards.findOne(card.boardId);
return board && board.hasMember(userId);
};

18
server/rulesHelper.js
View file

@ -2,9 +2,9 @@ import { ReactiveCache } from '/imports/reactiveCache';
RulesHelper = {
async executeRules(activity) {
const matchingRules = this.findMatchingRules(activity);
const matchingRules = await this.findMatchingRules(activity);
for (let i = 0; i < matchingRules.length; i++) {
const action = matchingRules[i].getAction();
const action = await matchingRules[i].getAction();
if (action !== undefined) {
await this.performAction(activity, action);
}
@ -19,14 +19,14 @@ RulesHelper = {
const matchingMap = await this.buildMatchingFieldsMap(activity, matchingFields);
const matchingTriggers = await ReactiveCache.getTriggers(matchingMap);
const matchingRules = [];
matchingTriggers.forEach(function(trigger) {
const rule = trigger.getRule();
for (const trigger of matchingTriggers) {
const rule = await trigger.getRule();
// Check that for some unknown reason there are some leftover triggers
// not connected to any rules
if (rule !== undefined) {
matchingRules.push(trigger.getRule());
matchingRules.push(rule);
}
});
}
return matchingRules;
},
async buildMatchingFieldsMap(activity, matchingFields) {
@ -67,7 +67,7 @@ RulesHelper = {
let list;
let listId;
if (action.listName === '*') {
list = card.list();
list = await card.list();
if (boardId !== action.boardId) {
list = await ReactiveCache.getList({ title: list.title, boardId: action.boardId });
}
@ -110,12 +110,12 @@ RulesHelper = {
if (action.actionType === 'moveCardToTop') {
const minOrder = _.min(
list.cardsUnfiltered(swimlaneId).map(c => c.sort),
(await list.cardsUnfiltered(swimlaneId)).map(c => c.sort),
);
await card.move(action.boardId, swimlaneId, listId, minOrder - 1);
} else {
const maxOrder = _.max(
list.cardsUnfiltered(swimlaneId).map(c => c.sort),
(await list.cardsUnfiltered(swimlaneId)).map(c => c.sort),
);
await card.move(action.boardId, swimlaneId, listId, maxOrder + 1);
}