diff --git a/DepartmentPortal/Common/DesktopTools/BusinessLogics/ErrorMessanger.cs b/DepartmentPortal/Common/DesktopTools/BusinessLogics/ErrorMessanger.cs deleted file mode 100644 index ad0da1e..0000000 --- a/DepartmentPortal/Common/DesktopTools/BusinessLogics/ErrorMessanger.cs +++ /dev/null @@ -1,30 +0,0 @@ -using DesktopTools.Forms; -using System.Collections.Generic; -using System.Windows.Forms; - -namespace DesktopTools.BusinessLogics -{ - /// - /// Класс, отвечающий за вывод сообщения с ошибками - /// - public static class ErrorMessanger - { - /// - /// Вывод сообщения - /// - /// - /// - public static void PrintErrorMessage(string text, List> result) - { - if (result.Count == 1) - { - MessageBox.Show(result[0].Value, result[0].Key, MessageBoxButtons.OK, MessageBoxIcon.Error); - } - else - { - FormDisplayErrors form = new FormDisplayErrors(); - form.LoadData(text, result); - } - } - } -} \ No newline at end of file diff --git a/DepartmentPortal/Common/DesktopTools/Controls/ControlViewEntityList.Designer.cs b/DepartmentPortal/Common/DesktopTools/Controls/BaseControlViewEntityList.Designer.cs similarity index 97% rename from DepartmentPortal/Common/DesktopTools/Controls/ControlViewEntityList.Designer.cs rename to DepartmentPortal/Common/DesktopTools/Controls/BaseControlViewEntityList.Designer.cs index 61cf166..7fd47e2 100644 --- a/DepartmentPortal/Common/DesktopTools/Controls/ControlViewEntityList.Designer.cs +++ b/DepartmentPortal/Common/DesktopTools/Controls/BaseControlViewEntityList.Designer.cs @@ -1,7 +1,7 @@  namespace DesktopTools.Controls { - partial class ControlViewEntityList + partial class BaseControlViewEntityList { /// /// Обязательная переменная конструктора. diff --git a/DepartmentPortal/Common/DesktopTools/Controls/ControlViewEntityList.cs b/DepartmentPortal/Common/DesktopTools/Controls/BaseControlViewEntityList.cs similarity index 89% rename from DepartmentPortal/Common/DesktopTools/Controls/ControlViewEntityList.cs rename to DepartmentPortal/Common/DesktopTools/Controls/BaseControlViewEntityList.cs index daffbf1..e7e7380 100644 --- a/DepartmentPortal/Common/DesktopTools/Controls/ControlViewEntityList.cs +++ b/DepartmentPortal/Common/DesktopTools/Controls/BaseControlViewEntityList.cs @@ -4,7 +4,7 @@ using System.Windows.Forms; namespace DesktopTools.Controls { - public partial class ControlViewEntityList : UserControl + public partial class BaseControlViewEntityList : UserControl { /// /// Событие, вызываемое при закрытии контрола @@ -34,7 +34,7 @@ namespace DesktopTools.Controls /// Дубликат контрола /// /// - public virtual ControlViewEntityList Clone() { return null; } + public virtual BaseControlViewEntityList Clone() { return null; } /// /// Идентификатор контрола @@ -60,7 +60,7 @@ namespace DesktopTools.Controls /// /// Констркутор /// - public ControlViewEntityList() + public BaseControlViewEntityList() { InitializeComponent(); } diff --git a/DepartmentPortal/Common/DesktopTools/Controls/AbstractGenerticControlEntityList.resx b/DepartmentPortal/Common/DesktopTools/Controls/BaseControlViewEntityList.resx similarity index 100% rename from DepartmentPortal/Common/DesktopTools/Controls/AbstractGenerticControlEntityList.resx rename to DepartmentPortal/Common/DesktopTools/Controls/BaseControlViewEntityList.resx diff --git a/DepartmentPortal/Common/DesktopTools/Controls/AbstractGenerticControlEntityList.Designer.cs b/DepartmentPortal/Common/DesktopTools/Controls/GenericControlEntityList.Designer.cs similarity index 99% rename from DepartmentPortal/Common/DesktopTools/Controls/AbstractGenerticControlEntityList.Designer.cs rename to DepartmentPortal/Common/DesktopTools/Controls/GenericControlEntityList.Designer.cs index 1e33f0d..4a9039b 100644 --- a/DepartmentPortal/Common/DesktopTools/Controls/AbstractGenerticControlEntityList.Designer.cs +++ b/DepartmentPortal/Common/DesktopTools/Controls/GenericControlEntityList.Designer.cs @@ -1,6 +1,6 @@ namespace DesktopTools.Controls { - partial class AbstractGenerticControlEntityList + partial class GenericControlEntityList { /// /// Освободить все используемые ресурсы. diff --git a/DepartmentPortal/Common/DesktopTools/Controls/AbstractGenerticControlEntityList.cs b/DepartmentPortal/Common/DesktopTools/Controls/GenericControlEntityList.cs similarity index 98% rename from DepartmentPortal/Common/DesktopTools/Controls/AbstractGenerticControlEntityList.cs rename to DepartmentPortal/Common/DesktopTools/Controls/GenericControlEntityList.cs index 6f3b904..b0aa7a5 100644 --- a/DepartmentPortal/Common/DesktopTools/Controls/AbstractGenerticControlEntityList.cs +++ b/DepartmentPortal/Common/DesktopTools/Controls/GenericControlEntityList.cs @@ -11,12 +11,12 @@ using System.Windows.Forms; namespace DesktopTools.Controls { - public partial class AbstractGenerticControlEntityList : ControlViewEntityList + public partial class GenericControlEntityList : BaseControlViewEntityList where G : GetBindingModel where S : SetBindingModel where L: ListViewModel where E : ElementViewModel - where BL : BusinessLogicCore + where BL : GenericBusinessLogic { /// /// Объект бизнес-логики для получения данных @@ -26,7 +26,7 @@ namespace DesktopTools.Controls /// /// Констркутор /// - public AbstractGenerticControlEntityList() + public GenericControlEntityList() { InitializeComponent(); InitEvents(); diff --git a/DepartmentPortal/Common/DesktopTools/Controls/ControlViewEntityList.resx b/DepartmentPortal/Common/DesktopTools/Controls/GenericControlEntityList.resx similarity index 100% rename from DepartmentPortal/Common/DesktopTools/Controls/ControlViewEntityList.resx rename to DepartmentPortal/Common/DesktopTools/Controls/GenericControlEntityList.resx diff --git a/DepartmentPortal/Common/DesktopTools/Models/WindowDesktopExtensionControlModel.cs b/DepartmentPortal/Common/DesktopTools/Models/WindowDesktopExtensionControlModel.cs index cbedfbf..f6ba903 100644 --- a/DepartmentPortal/Common/DesktopTools/Models/WindowDesktopExtensionControlModel.cs +++ b/DepartmentPortal/Common/DesktopTools/Models/WindowDesktopExtensionControlModel.cs @@ -11,6 +11,6 @@ namespace DesktopTools.Models public string Title { get; set; } - public ControlViewEntityList Control { get; set; } + public BaseControlViewEntityList Control { get; set; } } } \ No newline at end of file diff --git a/DepartmentPortal/Common/ModuleTools/BusinessLogics/BusinessLogicCore.cs b/DepartmentPortal/Common/ModuleTools/BusinessLogics/GenericBusinessLogic.cs similarity index 95% rename from DepartmentPortal/Common/ModuleTools/BusinessLogics/BusinessLogicCore.cs rename to DepartmentPortal/Common/ModuleTools/BusinessLogics/GenericBusinessLogic.cs index 6b225f8..0d2252b 100644 --- a/DepartmentPortal/Common/ModuleTools/BusinessLogics/BusinessLogicCore.cs +++ b/DepartmentPortal/Common/ModuleTools/BusinessLogics/GenericBusinessLogic.cs @@ -15,7 +15,7 @@ namespace ModuleTools.BusinessLogics /// /// /// - public class BusinessLogicCore + public class GenericBusinessLogic where G : GetBindingModel where S : SetBindingModel where L : ListViewModel @@ -29,7 +29,7 @@ namespace ModuleTools.BusinessLogics /// /// Сервис с хранилищем данных /// - protected IEntityService Service { get; set; } + protected IGenerticEntityService Service { get; set; } /// /// Менеджер безопасности @@ -51,7 +51,7 @@ namespace ModuleTools.BusinessLogics /// protected bool _allowSimpleView = true; - public BusinessLogicCore(IEntityService service, string entity, AccessOperation serviceOperation) + public GenericBusinessLogic(IGenerticEntityService service, string entity, AccessOperation serviceOperation) { Service = service; Errors = new List<(string Title, string Message)>(); diff --git a/DepartmentPortal/Common/ModuleTools/Interfaces/IEntityService.cs b/DepartmentPortal/Common/ModuleTools/Interfaces/IGenerticEntityService.cs similarity index 95% rename from DepartmentPortal/Common/ModuleTools/Interfaces/IEntityService.cs rename to DepartmentPortal/Common/ModuleTools/Interfaces/IGenerticEntityService.cs index 106f0f5..c13f548 100644 --- a/DepartmentPortal/Common/ModuleTools/Interfaces/IEntityService.cs +++ b/DepartmentPortal/Common/ModuleTools/Interfaces/IGenerticEntityService.cs @@ -6,7 +6,7 @@ namespace ModuleTools.Interfaces /// /// Описание логики для хранилища сущности /// - public interface IEntityService + public interface IGenerticEntityService where G : GetBindingModel where S : SetBindingModel { diff --git a/DepartmentPortal/DepartmentPortalDesctop/ErrorMessanger.cs b/DepartmentPortal/DepartmentPortalDesctop/ErrorMessanger.cs new file mode 100644 index 0000000..9434d67 --- /dev/null +++ b/DepartmentPortal/DepartmentPortalDesctop/ErrorMessanger.cs @@ -0,0 +1,29 @@ +using System.Collections.Generic; +using System.Windows.Forms; + +namespace DepartmentPortalDesctop +{ + /// + /// Класс, отвечающий за вывод сообщения с ошибками + /// + public static class ErrorMessanger + { + /// + /// Вывод сообщения + /// + /// + /// + public static void PrintErrorMessage(string text, List> result) + { + if (result.Count == 1) + { + MessageBox.Show(result[0].Value, result[0].Key, MessageBoxButtons.OK, MessageBoxIcon.Error); + } + else + { + FormDisplayErrors form = new FormDisplayErrors(); + form.LoadData(text, result); + } + } + } +} \ No newline at end of file diff --git a/DepartmentPortal/Common/DesktopTools/Forms/FormDisplayErrors.Designer.cs b/DepartmentPortal/DepartmentPortalDesctop/FormDisplayErrors.Designer.cs similarity index 94% rename from DepartmentPortal/Common/DesktopTools/Forms/FormDisplayErrors.Designer.cs rename to DepartmentPortal/DepartmentPortalDesctop/FormDisplayErrors.Designer.cs index 9a8e37d..2241500 100644 --- a/DepartmentPortal/Common/DesktopTools/Forms/FormDisplayErrors.Designer.cs +++ b/DepartmentPortal/DepartmentPortalDesctop/FormDisplayErrors.Designer.cs @@ -1,5 +1,5 @@  -namespace DesktopTools.Forms +namespace DepartmentPortalDesctop { partial class FormDisplayErrors { @@ -53,7 +53,7 @@ namespace DesktopTools.Forms this.dataGridViewErrors.RowHeadersVisible = false; this.dataGridViewErrors.RowTemplate.Height = 25; this.dataGridViewErrors.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridViewErrors.Size = new System.Drawing.Size(588, 450); + this.dataGridViewErrors.Size = new System.Drawing.Size(671, 450); this.dataGridViewErrors.TabIndex = 0; // // ColumnKey @@ -74,10 +74,10 @@ namespace DesktopTools.Forms // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(588, 450); + this.ClientSize = new System.Drawing.Size(671, 450); this.Controls.Add(this.dataGridViewErrors); this.Name = "FormDisplayErrors"; - this.Text = "Ошибки"; + this.Text = "FormDisplayErrors"; ((System.ComponentModel.ISupportInitialize)(this.dataGridViewErrors)).EndInit(); this.ResumeLayout(false); diff --git a/DepartmentPortal/Common/DesktopTools/Forms/FormDisplayErrors.cs b/DepartmentPortal/DepartmentPortalDesctop/FormDisplayErrors.cs similarity index 92% rename from DepartmentPortal/Common/DesktopTools/Forms/FormDisplayErrors.cs rename to DepartmentPortal/DepartmentPortalDesctop/FormDisplayErrors.cs index 5a5f198..f7570c6 100644 --- a/DepartmentPortal/Common/DesktopTools/Forms/FormDisplayErrors.cs +++ b/DepartmentPortal/DepartmentPortalDesctop/FormDisplayErrors.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Windows.Forms; -namespace DesktopTools.Forms +namespace DepartmentPortalDesctop { public partial class FormDisplayErrors : Form { diff --git a/DepartmentPortal/Common/DesktopTools/Forms/FormDisplayErrors.resx b/DepartmentPortal/DepartmentPortalDesctop/FormDisplayErrors.resx similarity index 100% rename from DepartmentPortal/Common/DesktopTools/Forms/FormDisplayErrors.resx rename to DepartmentPortal/DepartmentPortalDesctop/FormDisplayErrors.resx diff --git a/DepartmentPortal/DepartmentPortalDesctop/FormEnter.cs b/DepartmentPortal/DepartmentPortalDesctop/FormEnter.cs index 733ba9e..008995e 100644 --- a/DepartmentPortal/DepartmentPortalDesctop/FormEnter.cs +++ b/DepartmentPortal/DepartmentPortalDesctop/FormEnter.cs @@ -1,5 +1,4 @@ -using DesktopTools.BusinessLogics; -using ModuleTools.BusinessLogics; +using ModuleTools.BusinessLogics; using ModuleTools.Extensions; using ModuleTools.Interfaces; using System; diff --git a/DepartmentPortal/DepartmentPortalDesctop/FormMain.cs b/DepartmentPortal/DepartmentPortalDesctop/FormMain.cs index edbee17..3d10871 100644 --- a/DepartmentPortal/DepartmentPortalDesctop/FormMain.cs +++ b/DepartmentPortal/DepartmentPortalDesctop/FormMain.cs @@ -9,15 +9,15 @@ namespace DepartmentPortalDesctop { public partial class FormMain : Form { - private readonly Dictionary _baseControls; + private readonly Dictionary _baseControls; - private readonly Dictionary _controls; + private readonly Dictionary _controls; public FormMain() { InitializeComponent(); - _baseControls = new Dictionary(); - _controls = new Dictionary(); + _baseControls = new Dictionary(); + _controls = new Dictionary(); var extensions = DesktopLoader.GetWindowDesktopExtensions(); foreach (var extens in extensions) @@ -28,7 +28,7 @@ namespace DepartmentPortalDesctop var menu = new ToolStripMenuItem { Text = list[0].Title }; for (int i = 0; i < list.Count; i++) { - if (list[i].Control is ControlViewEntityList control) + if (list[i].Control is BaseControlViewEntityList control) { if (_baseControls.ContainsKey(list[i].Id)) { diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/AccessBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/AccessBusinessLogic.cs index 5089123..68f0d8a 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/AccessBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/AccessBusinessLogic.cs @@ -9,7 +9,7 @@ namespace SecurityBusinessLogic.BusinessLogics /// /// Логика работы с доступами /// - public class AccessBusinessLogic : BusinessLogicCore + public class AccessBusinessLogic : GenericBusinessLogic { public AccessBusinessLogic(IAccessService service) : base(service, "Доступы", AccessOperation.Доступы) { } } diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/EnviromentSettingBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/EnviromentSettingBusinessLogic.cs index f8dcf45..8378046 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/EnviromentSettingBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/EnviromentSettingBusinessLogic.cs @@ -9,7 +9,7 @@ namespace SecurityBusinessLogic.BusinessLogics /// /// Логика работы с общими настройками системы /// - public class EnviromentSettingBusinessLogic : BusinessLogicCore { public EnviromentSettingBusinessLogic(IEnviromentSettingService service) : base(service, "Настройки Среды", AccessOperation.НастройкиСреды) { } diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/RoleBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/RoleBusinessLogic.cs index 9cf2323..21790d5 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/RoleBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/RoleBusinessLogic.cs @@ -9,7 +9,7 @@ namespace SecurityBusinessLogic.BusinessLogics /// /// Логика работы с ролями /// - public class RoleBusinessLogic : BusinessLogicCore + public class RoleBusinessLogic : GenericBusinessLogic { public RoleBusinessLogic(IRoleService service) : base(service, "Роли", AccessOperation.Роли) { } } diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/UserBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/UserBusinessLogic.cs index 17b5f6f..4591d07 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/UserBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/UserBusinessLogic.cs @@ -9,7 +9,7 @@ namespace SecurityBusinessLogic.BusinessLogics /// /// Логика работы с пользователями /// - public class UserBusinessLogic : BusinessLogicCore + public class UserBusinessLogic : GenericBusinessLogic { public UserBusinessLogic(IUserService service) : base(service, "Пользователи", AccessOperation.Пользователи) { } } diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IAccessService.cs b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IAccessService.cs index 5be9efc..fd4d517 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IAccessService.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IAccessService.cs @@ -6,5 +6,5 @@ namespace SecurityBusinessLogic.Interfaces /// /// Хранение доступов /// - public interface IAccessService : IEntityService { } + public interface IAccessService : IGenerticEntityService { } } \ No newline at end of file diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IEnviromentSettingService.cs b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IEnviromentSettingService.cs index 5189fac..f0fc73c 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IEnviromentSettingService.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IEnviromentSettingService.cs @@ -6,5 +6,5 @@ namespace SecurityBusinessLogic.Interfaces /// /// Хранение общих настроек системы /// - public interface IEnviromentSettingService : IEntityService { } + public interface IEnviromentSettingService : IGenerticEntityService { } } \ No newline at end of file diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IRoleService.cs b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IRoleService.cs index fa4515a..c8e50eb 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IRoleService.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IRoleService.cs @@ -6,5 +6,5 @@ namespace SecurityBusinessLogic.Interfaces /// /// Хранение ролей /// - public interface IRoleService : IEntityService { } + public interface IRoleService : IGenerticEntityService { } } \ No newline at end of file diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IUserService.cs b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IUserService.cs index 19ef165..e177d3f 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IUserService.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/Interfaces/IUserService.cs @@ -6,5 +6,5 @@ namespace SecurityBusinessLogic.Interfaces /// /// Хранение пользователей /// - public interface IUserService : IEntityService { } + public interface IUserService : IGenerticEntityService { } } \ No newline at end of file diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/Controls/AccessesControl.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/Controls/AccessesControl.cs index 26ebeb7..d1ae95e 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/Controls/AccessesControl.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/Controls/AccessesControl.cs @@ -11,7 +11,7 @@ using System.Linq; namespace SecurityWindowsDesktop.Controls { - public partial class AccessesControl : AbstractGenerticControlEntityList + public partial class AccessesControl : GenericControlEntityList { private readonly RoleBusinessLogic _roleBusinessLogic; @@ -25,7 +25,7 @@ namespace SecurityWindowsDesktop.Controls AccessOperation = AccessOperation.Доступы; } - public override ControlViewEntityList Clone() => new AccessesControl() { Id = Guid.NewGuid() }; + public override BaseControlViewEntityList Clone() => new AccessesControl() { Id = Guid.NewGuid() }; protected override ControlViewEntityListConfiguration GetConfig() => new() { diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/Controls/EnviromentSettingControl.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/Controls/EnviromentSettingControl.cs index d491103..9b02f5b 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/Controls/EnviromentSettingControl.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/Controls/EnviromentSettingControl.cs @@ -9,7 +9,7 @@ using System; namespace SecurityWindowsDesktop.Controls { - public partial class EnviromentSettingControl : AbstractGenerticControlEntityList + public partial class EnviromentSettingControl : GenericControlEntityList { public EnviromentSettingControl() { @@ -20,7 +20,7 @@ namespace SecurityWindowsDesktop.Controls AccessOperation = AccessOperation.НастройкиСреды; } - public override ControlViewEntityList Clone() => new EnviromentSettingControl() { Id = Guid.NewGuid() }; + public override BaseControlViewEntityList Clone() => new EnviromentSettingControl() { Id = Guid.NewGuid() }; protected override ControlViewEntityListConfiguration GetConfig() => new() { diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/Controls/RolesControl.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/Controls/RolesControl.cs index 67d1cde..d50577e 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/Controls/RolesControl.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/Controls/RolesControl.cs @@ -9,7 +9,7 @@ using System; namespace SecurityWindowsDesktop.Controls { - public partial class RolesControl : AbstractGenerticControlEntityList + public partial class RolesControl : GenericControlEntityList { public RolesControl() : base() { @@ -20,7 +20,7 @@ namespace SecurityWindowsDesktop.Controls AccessOperation = AccessOperation.Роли; } - public override ControlViewEntityList Clone() => new RolesControl() { Id = Guid.NewGuid() }; + public override BaseControlViewEntityList Clone() => new RolesControl() { Id = Guid.NewGuid() }; protected override ControlViewEntityListConfiguration GetConfig() => new() { diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/Controls/UsersControl.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/Controls/UsersControl.cs index b97f6da..1bb23cd 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/Controls/UsersControl.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/Controls/UsersControl.cs @@ -9,7 +9,7 @@ using System; namespace SecurityWindowsDesktop.Controls { - public partial class UsersControl : AbstractGenerticControlEntityList + public partial class UsersControl : GenericControlEntityList { public UsersControl() : base() { @@ -20,7 +20,7 @@ namespace SecurityWindowsDesktop.Controls AccessOperation = AccessOperation.Пользователи; } - public override ControlViewEntityList Clone() => new UsersControl() { Id = Guid.NewGuid() }; + public override BaseControlViewEntityList Clone() => new UsersControl() { Id = Guid.NewGuid() }; protected override ControlViewEntityListConfiguration GetConfig() => new() { diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs index 68d488a..bae0957 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs @@ -31,7 +31,7 @@ namespace SecurityWindowsDesktop { new WindowDesktopExtensionControlModel { Order = 0, Title = "Администрирование" } }; - List _controls = new() + List _controls = new() { new UsersControl(), new RolesControl(),