From a13635ab4e137210d32b153cebc09a8475c248be Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Tue, 1 Jul 2025 12:59:54 +0200 Subject: [PATCH] =?UTF-8?q?-=20Sistemato=20i=20Referenti=20(e=20non=20Edit?= =?UTF-8?q?ori),=20quando=20crei=20un=20nuovo=20Catalogo=20ti=20imposta=20?= =?UTF-8?q?la=20propriet=C3=A0=20a=20te,=20ma=20chiunque=20Collaboratore?= =?UTF-8?q?=20potrebbe=20cmq=20modificartelo.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/models/catalog.js | 6 ++++++ src/server/router/catalogs_router.js | 3 ++- src/server/router/index_router.js | 10 ++++++++++ src/server/tools/globalTables.js | 14 +++++++++----- src/server/version.txt | 2 +- 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/server/models/catalog.js b/src/server/models/catalog.js index 96d0033..07e432d 100755 --- a/src/server/models/catalog.js +++ b/src/server/models/catalog.js @@ -93,6 +93,12 @@ const CatalogSchema = new Schema({ data_lista_generata: { type: Date, }, + data_lista_updated: { + type: Date, + }, + username_lista_updated: { + type: String, + }, pdf_online: String, pdf_online_size: String, data_online: { diff --git a/src/server/router/catalogs_router.js b/src/server/router/catalogs_router.js index c22b484..9f569d9 100755 --- a/src/server/router/catalogs_router.js +++ b/src/server/router/catalogs_router.js @@ -51,9 +51,10 @@ router.get('/id/:id', async function (req, res) { router.post('/addnew', authenticate, async function (req, res, next) { const idapp = req.body.idapp; const data = req.body.newCatalog; + const username = req.user.username; try { - const newrecs = await globalTables.addNewCatalog(idapp, data); + const newrecs = await globalTables.addNewCatalog(idapp, data, username); if (newrecs) { return res.send({ code: server_constants.RIS_CODE_OK, data: newrecs }); } else { diff --git a/src/server/router/index_router.js b/src/server/router/index_router.js index dcac2cb..1548e32 100755 --- a/src/server/router/index_router.js +++ b/src/server/router/index_router.js @@ -721,6 +721,16 @@ router.post('/getobj', authenticate_noerror, async (req, res) => { ) .sort({ username: 1 }) .lean(); + } else if (cmd === 'lista_referenti') { + ris = await User.find( + { + idapp, + perm: { $bitsAnySet: 0b110010000 }, + }, + { username: 1, name: 1, surname: 1 } + ) + .sort({ username: 1 }) + .lean(); } // Invia la risposta diff --git a/src/server/tools/globalTables.js b/src/server/tools/globalTables.js index 5019f76..2ed5473 100755 --- a/src/server/tools/globalTables.js +++ b/src/server/tools/globalTables.js @@ -984,7 +984,7 @@ module.exports = { } }, - async cloneCatalog(idapp, idOrig, newName, idPageAssigned) { + async cloneCatalog(idapp, idOrig, newName, idPageAssigned, referenti) { try { // Recupera il catalogo originale const mycatalog = await Catalog.findOne({ idapp, _id: idOrig }).lean(); @@ -1014,6 +1014,7 @@ module.exports = { pagina_introduttiva_sfondo_nero: mycatalog.pagina_introduttiva_sfondo_nero, backcolor: mycatalog.backcolor, idPageAssigned: idPageAssigned, + referenti, }; const mydirpath = tools.getdirByIdApp(idapp); @@ -1034,7 +1035,7 @@ module.exports = { } }, - async newEmptyCatalog(idapp, newName, idPageAssigned) { + async newEmptyCatalog(idapp, newName, idPageAssigned, referenti) { try { const clonedCatalog = { @@ -1042,6 +1043,7 @@ module.exports = { active: true, title: newName, idPageAssigned: idPageAssigned, + referenti, }; // Salva la pagina @@ -1126,7 +1128,7 @@ module.exports = { } }, - async addNewCatalog(idapp, newCatalog) { + async addNewCatalog(idapp, newCatalog, username) { try { if (newCatalog) { const myNewrecs = await this.duplicatePage(newCatalog.idPageTemplate, newCatalog.path, newCatalog.title); @@ -1144,13 +1146,15 @@ module.exports = { idapp, newCatalog.idCatalogToCopy, newCatalog.title, - myNewrecs?.newPage._id + myNewrecs?.newPage._id, + [username], ); } else { mynewCatalog = await this.newEmptyCatalog( idapp, newCatalog.title, - myNewrecs?.newPage._id + myNewrecs?.newPage._id, + [username], ); } diff --git a/src/server/version.txt b/src/server/version.txt index b38ee02..f821c29 100644 --- a/src/server/version.txt +++ b/src/server/version.txt @@ -1 +1 @@ -1.2.58 \ No newline at end of file +1.2.59 \ No newline at end of file