From 6206c867c776d56271a5fccf92d944ba67d78685 Mon Sep 17 00:00:00 2001 From: prog1764 Date: Tue, 4 Aug 2026 17:50:22 +0400 Subject: [PATCH] =?UTF-8?q?fix:=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=BE=20=D0=BF=D0=BE=D0=BB=D0=B5=20=C2=AB=D0=A5=D0=B0=D1=80?= =?UTF-8?q?=D0=B0=D0=BA=D1=82=D0=B5=D1=80=D0=B8=D1=81=D1=82=D0=B8=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=D1=80=D1=83=D1=88=D0=B8=D1=82=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=C2=BB=20(=D0=BF=D1=80=D0=B8=D0=B4=D1=83=D0=BC=D0=B0?= =?UTF-8?q?=D0=BD=D0=BE,=20=D0=B2=20=D0=BE=D0=BF=D1=80=D0=BE=D1=81=D0=BD?= =?UTF-8?q?=D0=B8=D0=BA=D0=B5=20=D0=BD=D0=B5=D1=82)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - убрано из вкладки «Безопасность» (UI), модели InformationSystem, маппингов _collect_is/_on_is_select, _copy_is, _apply_imported_data, variables.py и данных для ИИ-проверки - «Категория нарушителя» остаётся (из варианта 3 Кости) --- dokogen/models.py | 1 - dokogen/ui.py | 19 ------------------- dokogen/variables.py | 1 - 3 files changed, 21 deletions(-) diff --git a/dokogen/models.py b/dokogen/models.py index 86cf92b..792013f 100644 --- a/dokogen/models.py +++ b/dokogen/models.py @@ -68,7 +68,6 @@ class InformationSystem: # Безопасность (236 приказ) attacker_category: str = "" # Категория нарушителя (внешний/внутренний) - attacker_characteristics: str = "" # Краткая характеристика возможностей нарушителя threats: str = "" # Основные угрозы безопасности информации (\n — разделитель) incidents: str = "" # Типы компьютерных инцидентов (\n — разделитель) criteria_values: str = "" # Показатели критериев значимости (\n — разделитель) diff --git a/dokogen/ui.py b/dokogen/ui.py index d732168..4662f2c 100644 --- a/dokogen/ui.py +++ b/dokogen/ui.py @@ -983,20 +983,6 @@ class DokoGenApp: except Exception: pass - ttk.Label(sec_left, text="Характеристика нарушителя:").pack(anchor=tk.W) - sec_char_row = ttk.Frame(sec_left) - sec_char_row.pack(fill=tk.X, pady=(2, 4)) - self.is_attacker_characteristics_listbox = tk.Listbox(sec_char_row, height=2, exportselection=False) - self.is_attacker_characteristics_listbox.pack(side=tk.LEFT, fill=tk.BOTH, expand=True) - sec_char_btn = ttk.Frame(sec_char_row) - sec_char_btn.pack(side=tk.RIGHT, padx=(4, 0)) - ttk.Button(sec_char_btn, text="+", width=2, - command=lambda: self._add_sw_item(self.is_attacker_characteristics_listbox)).pack(pady=1) - ttk.Button(sec_char_btn, text="-", width=2, - command=lambda: self._del_sw_item(self.is_attacker_characteristics_listbox)).pack(pady=1) - ttk.Button(sec_char_btn, text="✏️", width=3, - command=lambda: self._edit_sw_item(self.is_attacker_characteristics_listbox)).pack(pady=1) - ttk.Label(sec_left, text="Основные угрозы БИ:").pack(anchor=tk.W) sec_thr_row = ttk.Frame(sec_left) sec_thr_row.pack(fill=tk.BOTH, expand=True, pady=(2, 4)) @@ -1316,7 +1302,6 @@ class DokoGenApp: ('is_os_sw_listbox', 'os_sw'), ('is_app_sw_listbox', 'app_sw'), ('is_attacker_category_combo', 'attacker_category'), - ('is_attacker_characteristics_listbox', 'attacker_characteristics'), ('is_threats_listbox', 'threats'), ('is_incidents_listbox', 'incidents'), ('is_criteria_values_listbox', 'criteria_values'), @@ -1551,7 +1536,6 @@ class DokoGenApp: ('is_os_sw_listbox', 'os_sw'), ('is_app_sw_listbox', 'app_sw'), ('is_attacker_category_combo', 'attacker_category'), - ('is_attacker_characteristics_listbox', 'attacker_characteristics'), ('is_threats_listbox', 'threats'), ('is_incidents_listbox', 'incidents'), ('is_criteria_values_listbox', 'criteria_values'), @@ -1627,7 +1611,6 @@ class DokoGenApp: os_sw=src.os_sw, app_sw=src.app_sw, attacker_category=src.attacker_category, - attacker_characteristics=src.attacker_characteristics, threats=src.threats, incidents=src.incidents, criteria_values=src.criteria_values, @@ -2055,7 +2038,6 @@ class DokoGenApp: 'object_type': isys.object_type or '', 'architecture': isys.architecture or '', 'attacker_category': isys.attacker_category or '', - 'attacker_characteristics': isys.attacker_characteristics or '', 'threats': isys.threats or '', 'incidents': isys.incidents or '', 'criteria_values': isys.criteria_values or '', @@ -2765,7 +2747,6 @@ class DokoGenApp: os_sw=is_data.get('os_sw', ''), app_sw=is_data.get('app_sw', ''), attacker_category=is_data.get('attacker_category', ''), - attacker_characteristics=is_data.get('attacker_characteristics', ''), threats=is_data.get('threats', ''), incidents=is_data.get('incidents', ''), criteria_values=is_data.get('criteria_values', ''), diff --git a/dokogen/variables.py b/dokogen/variables.py index a23fd8e..fc63897 100644 --- a/dokogen/variables.py +++ b/dokogen/variables.py @@ -324,7 +324,6 @@ def _build_loop_data(company: Company, is_list: List) -> Dict[str, List[Dict]]: 'os_sw': getattr(isys, 'os_sw', '') or '—', 'app_sw': getattr(isys, 'app_sw', '') or '—', 'attacker_category': getattr(isys, 'attacker_category', '') or '—', - 'attacker_characteristics': getattr(isys, 'attacker_characteristics', '') or '—', 'threats': getattr(isys, 'threats', '') or '—', 'incidents': getattr(isys, 'incidents', '') or '—', 'criteria_values': getattr(isys, 'criteria_values', '') or '—',