surya/freeplanet_serverside
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corretto abiltiazione fiducia concessa

Browse Source
This commit is contained in:
Surya Paolo
2023-12-12 00:56:40 +01:00
parent caadbaae5f
commit 5f3c8a65ea
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@@ -1,4 +1,4 @@
DATABASE=test_PiuCheBuono DATABASE=test_FreePlanet
UDB=paofreeplanet UDB=paofreeplanet
PDB=mypassword@1A PDB=mypassword@1A
SEND_EMAIL=0 SEND_EMAIL=0

2
src/server/models/account.js
View File

@@ -636,7 +636,7 @@ AccountSchema.statics.updateQtaMax = async function (idapp, username, groupname,
else else
risult = await Account.updateOne({ idapp, username, circuitId }, { $set: paramstoupdate }); risult = await Account.updateOne({ idapp, username, circuitId }, { $set: paramstoupdate });
return risult; return risult && risult.nModified > 0;
}; };
AccountSchema.statics.getAccountsCircuitiNazionali = async function (idapp) { AccountSchema.statics.getAccountsCircuitiNazionali = async function (idapp) {

6
src/server/models/circuit.js
View File

@@ -1168,6 +1168,8 @@ CircuitSchema.statics.setFido = async function (idapp, username, circuitName, gr
let account = null; let account = null;
let fido = 0; let fido = 0;
let qtamax = 0; let qtamax = 0;
let variato = false;
let variato2 = false;
if (mycircuit.showAlways) { if (mycircuit.showAlways) {
@@ -1208,12 +1210,12 @@ CircuitSchema.statics.setFido = async function (idapp, username, circuitName, gr
if (account) { if (account) {
if (qtamax > 0) { if (qtamax > 0) {
await Account.updateQtaMax(idapp, username, groupname, circuitId, qtamax); variato = await Account.updateQtaMax(idapp, username, groupname, circuitId, qtamax);
} }
const ris = await Account.updateFido(idapp, username, groupname, circuitId, fido); const ris = await Account.updateFido(idapp, username, groupname, circuitId, fido);
if (ris) { if (ris) {
return { qta_maxConcessa: qtamax, fidoConcesso: fido }; return { qta_maxConcessa: qtamax, fidoConcesso: fido, changed: variato || (ris && ris.nModified > 0) };
} }
} }
} }

2
src/server/models/sendnotif.js
View File

@@ -357,6 +357,7 @@ sendNotifSchema.statics.getDescrAndLinkByRecNotif = async function (recnotif, us
let circuitname = ''; let circuitname = '';
let numuserincircuit = 0; let numuserincircuit = 0;
try { try {
circuitname = recnotif.paramsObj.circuitnameDest;
username_action = recnotif.paramsObj.username_action username_action = recnotif.paramsObj.username_action
username_mittente = recnotif.paramsObj.sender ? recnotif.paramsObj.sender : username_action username_mittente = recnotif.paramsObj.sender ? recnotif.paramsObj.sender : username_action
myorig = recnotif.paramsObj.extrarec.grouporig; myorig = recnotif.paramsObj.extrarec.grouporig;
@@ -364,7 +365,6 @@ sendNotifSchema.statics.getDescrAndLinkByRecNotif = async function (recnotif, us
destinatario = recnotif.paramsObj.extrarec.dest ? recnotif.paramsObj.extrarec.dest : (recnotif.paramsObj.extrarec.groupdest ? recnotif.paramsObj.extrarec.groupdest : recnotif.paramsObj.extrarec.contoComDest); destinatario = recnotif.paramsObj.extrarec.dest ? recnotif.paramsObj.extrarec.dest : (recnotif.paramsObj.extrarec.groupdest ? recnotif.paramsObj.extrarec.groupdest : recnotif.paramsObj.extrarec.contoComDest);
qty = recnotif.paramsObj.extrarec && recnotif.paramsObj.extrarec.qty ? recnotif.paramsObj.extrarec.qty.toString() : ''; qty = recnotif.paramsObj.extrarec && recnotif.paramsObj.extrarec.qty ? recnotif.paramsObj.extrarec.qty.toString() : '';
symbol = recnotif.paramsObj.extrarec ? recnotif.paramsObj.extrarec.symbol : ''; symbol = recnotif.paramsObj.extrarec ? recnotif.paramsObj.extrarec.symbol : '';
circuitname = recnotif.paramsObj.circuitnameDest;
numuserincircuit = await User.countUsersInCircuit(recnotif.idapp, circuitname); numuserincircuit = await User.countUsersInCircuit(recnotif.idapp, circuitname);
} catch (e) { } catch (e) {

2
src/server/models/user.js
View File

@@ -2763,7 +2763,7 @@ UserSchema.statics.setCircuitCmd = async function (idapp, usernameOrig, circuitn
} else if (cmd === shared_consts.CIRCUITCMD.SETFIDO) { } else if (cmd === shared_consts.CIRCUITCMD.SETFIDO) {
ris = await Circuit.setFido(idapp, usernameOrig, circuitname, groupname); ris = await Circuit.setFido(idapp, usernameOrig, circuitname, groupname);
if (ris && ris.fidoConcesso) { if (ris && ris.fidoConcesso && ris.changed) {
if (extrarec) { if (extrarec) {
extrarec.fidoConcesso = ris.fidoConcesso; extrarec.fidoConcesso = ris.fidoConcesso;