starred/planka
1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-12-20 01:14:12 +03:00
Code Issues 418 Packages Projects Releases 12 Wiki Activity

fix: Correctly parse environment variables, little refactoring

Browse Source
This commit is contained in:
Maksim Eltyshev
2025-09-05 00:19:35 +02:00
parent eb259a1482
commit 203fbd152d
7 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/api/hooks/query-methods/models/List.js
View File

@@ -76,19 +76,16 @@ const updateOne = async (criteria, values) => {
.set({ ...values })
.usingConnection(db);
let cards = [];
let tasks = [];
if (list) {
if (list.boardId !== prev.boardId) {
await Card.update(
{
listId: list.id,
},
{
await Card.update({
listId: list.id,
})
.set({
boardId: list.boardId,
},
).usingConnection(db);
})
.usingConnection(db);
}
const prevTypeState = List.TYPE_STATE_BY_TYPE[prev.type];
@@ -102,7 +99,7 @@ const updateOne = async (criteria, values) => {
const isClosed = transitions[`${prevTypeState}->${typeState}`];
if (!_.isUndefined(isClosed)) {
cards = await Card.update({
const cards = await Card.update({
listId: list.id,
})
.set({
@@ -124,7 +121,7 @@ const updateOne = async (criteria, values) => {
}
}
return { list, cards, tasks };
return { list, tasks };
});
}

4
server/api/hooks/query-methods/models/User.js
View File

@@ -24,7 +24,7 @@ const defaultFind = (criteria) => User.find(criteria).sort('id');
/* Query methods */
const createOne = (values) => {
if (!_.isNil(sails.config.custom.activeUsersLimit)) {
if (sails.config.custom.activeUsersLimit !== null) {
return sails.getDatastore().transaction(async (db) => {
const queryResult = await sails
.sendNativeQuery('SELECT NULL FROM user_account WHERE is_deactivated = $1 FOR UPDATE', [
@@ -80,7 +80,7 @@ const getOneActiveByEmailOrUsername = (emailOrUsername) => {
const updateOne = async (criteria, values) => {
const enforceActiveLimit =
values.isDeactivated === false && !_.isNil(sails.config.custom.activeUsersLimit);
values.isDeactivated === false && sails.config.custom.activeUsersLimit !== null;
if (!_.isUndefined(values.avatar) || enforceActiveLimit) {
return sails.getDatastore().transaction(async (db) => {