From 16c307103fde2992fb2024e8ae0492b38efc1558 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 6 Feb 2025 19:44:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D1=80=D0=B5=D1=82=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D1=87=D1=83=D0=B6=D0=B8=D1=85=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  4 ++--
 .../Passes/Server/DeleteServerObjects.java    | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 682d75a2..9e46d6f9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/UserConnection.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Passes/Server/DeleteServerObjects.java b/src/_VisualDVM/Passes/Server/DeleteServerObjects.java
index ad01ed8c..15b36c83 100644
--- a/src/_VisualDVM/Passes/Server/DeleteServerObjects.java
+++ b/src/_VisualDVM/Passes/Server/DeleteServerObjects.java
@@ -1,6 +1,7 @@
 package _VisualDVM.Passes.Server;
 import Common.Database.Database;
 import Common.Database.Objects.DBObject;
+import Common.Database.Objects.riDBObject;
 import Common.Database.Tables.DBTable;
 import _VisualDVM.Global;
 import _VisualDVM.Repository.RepositoryServer;
@@ -42,7 +43,23 @@ public class DeleteServerObjects<S extends RepositoryServer, D extends DBObject>
         DBTable table = getDb().getTable(d);
         if (!table.getUI().CheckSelectedOrCurrent(Log))
             return false;
-        target = table.getUI().getSelectedOrCurrentKeys();
+        Vector<D> selected_or_current_objects = table.getUI().getSelectedOrCurrent();
+        Vector<Object> res = new Vector<>(); //ключи объектов после фильтрации.
+        Vector<Object> forbidden = new Vector<>();
+        for (D object: selected_or_current_objects){
+            if (object instanceof riDBObject){
+                riDBObject r = (riDBObject) object;
+                if (Global.mainModule.getAccount().CheckAuthorship(r.sender_address,null))
+                    res.add(r.getPK());
+                else
+                    forbidden.add(r.getPK());
+            }
+        }
+        if (!forbidden.isEmpty()){
+            Log.Writeln_("У вас нет прав на удаление "+forbidden.size()+" объектов!");
+            return false;
+        }
+        target = res;
         return table.getUI().ShowDeleteObjectsDialog(target.size());
     }
     //Очищаем все связанные таблицы, чтобы не допустить перерисовки во время удаления объекта.