- fix RIS in pendenti, se troppi msg, non compariva piu

- cataloghi, ricerca pickup
This commit is contained in:
Surya Paolo
2024-05-09 23:36:46 +02:00
parent 54443e784e
commit 3b1b2b9c83
13 changed files with 296 additions and 94 deletions

View File

@@ -2017,6 +2017,18 @@ module.exports = {
return query;
},
sanitizzaHtml(html) {
try {
return sanitizeHtml(html);
} catch (e) {
return html
}
},
sanitizzaLookup: function (str) {
return str;
},
sanitizzaProjection: function (mioproj) {
// mioproj = {valore: '$password'};
@@ -2406,8 +2418,8 @@ module.exports = {
let query = [];
if (params.filter && params.fieldsearch) {
params.filter = sanitizeHtml(params.filter);
params.fieldsearch = sanitizeHtml(params.fieldsearch);
params.filter = this.sanitizzaHtml(params.filter);
params.fieldsearch = this.sanitizzaHtml(params.fieldsearch);
const querytemp = this.getFilterParam(params.filter, params.fieldsearch);
if (querytemp) {
query = [...query, ...querytemp];
@@ -2424,7 +2436,7 @@ module.exports = {
// }
if (params.filterand) {
params.filterand = sanitizeHtml(params.filterand);
params.filterand = this.sanitizzaHtml(params.filterand);
if (params.filterand.includes(
shared_consts.FILTER_EXTRALIST_NOT_REGISTERED))
@@ -2545,7 +2557,7 @@ module.exports = {
}
if (params.filtercustom) {
params.filtercustom = sanitizeHtml(params.filtercustom);
params.filtercustom = this.sanitizzaHtml(params.filtercustom);
let condition = {};
for (const myfilter of params.filtercustom) {
if (myfilter['userId']) {
@@ -2572,7 +2584,7 @@ module.exports = {
}
if (params.filter_gte) {
params.filter_gte = sanitizeHtml(params.filter_gte);
params.filter_gte = this.sanitizzaHtml(params.filter_gte);
for (let ind = 0; ind < params.filter_gte.length; ind++) {
for (const [key, value] of Object.entries(params.filter_gte[ind])) {
if (value > 0) {
@@ -2585,7 +2597,7 @@ module.exports = {
}
if (params.filtersearch) {
params.filtersearch = sanitizeHtml(params.filtersearch);
params.filtersearch = this.sanitizzaHtml(params.filtersearch);
filtriadded.push(...params.filtersearch);
}
@@ -2597,13 +2609,13 @@ module.exports = {
if (params.filterextra) {
params.filterextra = sanitizeHtml(params.filterextra);
params.filterextra = this.sanitizzaHtml(params.filterextra);
if (params.filterextra.length > 0)
query = [...query, ...params.filterextra]
}
if (filtriadded) {
filtriadded = sanitizeHtml(filtriadded);
filtriadded = this.sanitizzaHtml(filtriadded);
if (filtriadded.length > 0)
query.push({ $match: { $and: filtriadded } });
}