From 24e0e39782900edd7fb8dc53a751aa01eaaa80e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CNaeel=E2=80=9D?= <tazet@narod.ru>
Date: Tue, 16 Jun 2026 04:51:42 +0400
Subject: [PATCH] =?UTF-8?q?v0.5.136:=20=E2=86=BA=20=D1=8F=D1=80=D0=BA?=
 =?UTF-8?q?=D0=B0=D1=8F,=20deleted=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5?=
 =?UTF-8?q?=20restore/delete?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json           |  2 +-
 v2/src/config/index.js |  2 +-
 v2/src/user/index.js   | 10 ++++++----
 views/v2/user.ejs      |  4 +++-
 4 files changed, 11 insertions(+), 7 deletions(-)

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 @@
             <td style="text-align:center;">
               <% if (!e.deleted_at) { %>
                 <form method="POST" action="/v2/app/delete/<%= e.id %>" style="display:inline;">
+                  <input type="hidden" name="deleted" value="<%= includeDeleted ? '1' : '0' %>">
                   <button type="submit" class="btn btn-sm btn-danger" onclick="return confirm('Удалить?')" title="Удалить">🗑️</button>
                 </form>
               <% } else { %>
                 <form method="POST" action="/v2/app/restore/<%= e.id %>" style="display:inline;">
-                  <button type="submit" class="btn btn-sm" title="Восстановить">↺</button>
+                  <input type="hidden" name="deleted" value="<%= includeDeleted ? '1' : '0' %>">
+                  <button type="submit" class="btn btn-sm" title="Восстановить" style="color:var(--green);border-color:var(--green);">↺</button>
                 </form>
               <% } %>
             </td>