admin/WhatIDo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix trash: add missing deleted_at IS NOT NULL filter to main query

Browse Source
This commit is contained in:
dev
2026-09-09 23:44:37 +03:00
parent 0681831aaf
commit 5ae476551d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server.js
+3 -4
View File
@@ -2252,7 +2252,7 @@ app.get('/api/trash', requireAuth, async (req, res) => {
const { limit, offset } = req.query; const { limit, offset } = req.query;
const bw = branchScope(req.user); const bw = branchScope(req.user);
const scoped = req.user.role !== 'admin'; const scoped = req.user.role !== 'admin';
let where = ' WHERE 1=1'; let where = ' WHERE e.deleted_at IS NOT NULL';
const params = []; const params = [];
if (scoped) { if (scoped) {
if (bw.ids.length) { if (bw.ids.length) {
@@ -2263,9 +2263,8 @@ app.get('/api/trash', requireAuth, async (req, res) => {
} }
console.log(`[TRASH] User ${req.user.id} (${req.user.username}) role=${req.user.role} branch_ids=${JSON.stringify(bw.ids)} scoped=${scoped} where=${where} params=${JSON.stringify(params)}`); console.log(`[TRASH] User ${req.user.id} (${req.user.username}) role=${req.user.role} branch_ids=${JSON.stringify(bw.ids)} scoped=${scoped} where=${where} params=${JSON.stringify(params)}`);
const { rows: crows } = await pool.query( const { rows: crows } = await pool.query(
`SELECT count(*)::int AS n FROM entries e JOIN groups g ON g.id = e.group_id WHERE e.deleted_at IS NOT NULL` + `SELECT count(*)::int AS n FROM entries e JOIN groups g ON g.id = e.group_id ${where}`,
(scoped ? (bw.ids.length ? ` AND g.branch_id IN (${bw.ids.map((_, i) => `$${i + 1}`).join(',')})` : ' AND 1 = 0') : ''), params
scoped ? bw.ids : []
); );
const total = crows[0].n; const total = crows[0].n;
let q = `SELECT e.*, g.name AS group_name FROM entries e let q = `SELECT e.*, g.name AS group_name FROM entries e