diff --git a/package.json b/package.json index 08a599d..8f22b09 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ipwhitelist", - "version": "0.5.135", + "version": "0.5.136", "description": "IP WhiteList microservice for cloud provider", "main": "server.js", "scripts": { diff --git a/v2/src/config/index.js b/v2/src/config/index.js index 2550fe5..d3a2e57 100644 --- a/v2/src/config/index.js +++ b/v2/src/config/index.js @@ -9,7 +9,7 @@ // ═══════════════════════════════════════════════════════════════════════════════ module.exports = { - version: '0.5.135', + version: '0.5.136', // ── IAM ────────────────────────────────────────────────────────────────── iamUrl: process.env.V2_IAM_URL || 'https://auth-api.ngcloud.ru/api/v1/auth/user', diff --git a/v2/src/user/index.js b/v2/src/user/index.js index eb3c54d..1c6e345 100644 --- a/v2/src/user/index.js +++ b/v2/src/user/index.js @@ -114,21 +114,23 @@ function createUserRouter() { // ── POST /delete/:id ──────────────────────────────────────────────── router.post('/delete/:id', async (req, res) => { + const qs = (req.body && req.body.deleted === '1') ? '&deleted=1' : ''; try { await crud.remove(parseInt(req.params.id), req.clientId, req.email, req.impersonatedBy); - res.redirect('/v2/app?msg=Удалено'); + res.redirect('/v2/app?msg=Удалено' + qs); } catch (e) { - res.redirect('/v2/app?error=' + encodeURIComponent(e.message)); + res.redirect('/v2/app?error=' + encodeURIComponent(e.message) + qs); } }); // ── POST /restore/:id ────────────────────────────────────────────── router.post('/restore/:id', async (req, res) => { + const qs = (req.body && req.body.deleted === '1') ? '&deleted=1' : ''; try { await crud.restore(parseInt(req.params.id), req.clientId, req.email, req.impersonatedBy); - res.redirect('/v2/app?msg=Восстановлено'); + res.redirect('/v2/app?msg=Восстановлено' + qs); } catch (e) { - res.redirect('/v2/app?error=' + encodeURIComponent(e.message)); + res.redirect('/v2/app?error=' + encodeURIComponent(e.message) + qs); } }); diff --git a/views/v2/user.ejs b/views/v2/user.ejs index b39e98b..d6baff1 100644 --- a/views/v2/user.ejs +++ b/views/v2/user.ejs @@ -239,11 +239,13 @@ <% if (!e.deleted_at) { %>
+
<% } else { %>
- + +
<% } %>