фикс после изменения namespace контрлов безопасности
This commit is contained in:
parent
11c8de59e8
commit
1a027e7583
@ -241,7 +241,7 @@ namespace DesktopTools.Controls
|
||||
control = new BaseControlEnum(property.Name, attribute.MustHaveValue, attribute.ReadOnly, property.PropertyType);
|
||||
break;
|
||||
case ControlType.ControlGuid:
|
||||
if (attribute.ControlTypeObject.IsNotEmpty())
|
||||
if (attribute.ControlTypeObject.IsNotEmpty() && Type.GetType(attribute.ControlTypeObject) != null)
|
||||
{
|
||||
control = new BaseControlGuid(property.Name, attribute.MustHaveValue, attribute.ReadOnly,
|
||||
DependencyManager.Instance.Resolve(Type.GetType(attribute.ControlTypeObject)) as IControlEntitySelectable,
|
||||
|
@ -17,7 +17,7 @@ namespace SecurityBusinessLogic.ViewModels
|
||||
public class AccessViewModel : ElementViewModel
|
||||
{
|
||||
[MapConfiguration("RoleId", AllowCopyWithoutRigth = false)]
|
||||
[ViewModelControlElementProperty("Роль", ControlType.ControlGuid, MustHaveValue = true, ReadOnly = true, ControlTypeObject = "SecurityWindowsDesktop.Controls.ControlRoleList, SecurityWindowsDesktop")]
|
||||
[ViewModelControlElementProperty("Роль", ControlType.ControlGuid, MustHaveValue = true, ReadOnly = true, ControlTypeObject = "SecurityWindowsDesktop.EntityControls.ControlRoleList, SecurityWindowsDesktop")]
|
||||
public Guid RoleId { get; set; }
|
||||
|
||||
[ViewModelControlListProperty("Роль", 100)]
|
||||
|
@ -14,9 +14,9 @@ namespace SecurityBusinessLogic.ViewModels
|
||||
/// </summary>
|
||||
[ViewModelControlElementClass(HaveDependenceEntities = true, Width = 800, Height = 500)]
|
||||
[ViewModelControlElementDependenceEntity(Title = "Доступы", Order = 1, ParentPropertyName = "RoleId",
|
||||
ControlTypeObject = "SecurityWindowsDesktop.Controls.ControlAccessList, SecurityWindowsDesktop")]
|
||||
ControlTypeObject = "SecurityWindowsDesktop.EntityControls.ControlAccessList, SecurityWindowsDesktop")]
|
||||
[ViewModelControlElementDependenceEntity(Title = "Пользователи", Order = 2, ParentPropertyName = "RoleId",
|
||||
ControlTypeObject = "SecurityWindowsDesktop.Controls.ControlRoleUserList, SecurityWindowsDesktop")]
|
||||
ControlTypeObject = "SecurityWindowsDesktop.EntityControls.ControlRoleUserList, SecurityWindowsDesktop")]
|
||||
public class RoleViewModel : ElementViewModel
|
||||
{
|
||||
[ViewModelControlListProperty("Название роли")]
|
||||
|
@ -17,7 +17,7 @@ namespace SecurityBusinessLogic.ViewModels
|
||||
public class UserRoleViewModel : ElementViewModel
|
||||
{
|
||||
[MapConfiguration("UserId", AllowCopyWithoutRigth = false)]
|
||||
[ViewModelControlElementProperty("Пользователь", ControlType.ControlGuid, MustHaveValue = true, ReadOnly = false, ControlTypeObject = "SecurityWindowsDesktop.Controls.ControlUserList, SecurityWindowsDesktop")]
|
||||
[ViewModelControlElementProperty("Пользователь", ControlType.ControlGuid, MustHaveValue = true, ReadOnly = false, ControlTypeObject = "SecurityWindowsDesktop.EntityControls.ControlUserList, SecurityWindowsDesktop")]
|
||||
public Guid UserId { get; set; }
|
||||
|
||||
[ViewModelControlListProperty("Пользователь")]
|
||||
@ -25,7 +25,7 @@ namespace SecurityBusinessLogic.ViewModels
|
||||
public string UserName { get; set; }
|
||||
|
||||
[MapConfiguration("RoleId", AllowCopyWithoutRigth = false)]
|
||||
[ViewModelControlElementProperty("Роль", ControlType.ControlGuid, MustHaveValue = true, ReadOnly = false, ControlTypeObject = "SecurityWindowsDesktop.Controls.ControlRoleList, SecurityWindowsDesktop")]
|
||||
[ViewModelControlElementProperty("Роль", ControlType.ControlGuid, MustHaveValue = true, ReadOnly = false, ControlTypeObject = "SecurityWindowsDesktop.EntityControls.ControlRoleList, SecurityWindowsDesktop")]
|
||||
public Guid RoleId { get; set; }
|
||||
|
||||
[ViewModelControlListProperty("Роль")]
|
||||
|
@ -15,7 +15,7 @@ namespace SecurityBusinessLogic.ViewModels
|
||||
/// </summary>
|
||||
[ViewModelControlElementClass(HaveDependenceEntities = true, Width = 800, Height = 500)]
|
||||
[ViewModelControlElementDependenceEntity(Title = "Роли", Order = 1, ParentPropertyName = "UserId",
|
||||
ControlTypeObject = "SecurityWindowsDesktop.Controls.ControlUserRoleList, SecurityWindowsDesktop")]
|
||||
ControlTypeObject = "SecurityWindowsDesktop.EntityControls.ControlUserRoleList, SecurityWindowsDesktop")]
|
||||
public class UserViewModel : ElementViewModel
|
||||
{
|
||||
[ViewModelControlListProperty("Пользователь")]
|
||||
|
Loading…
Reference in New Issue
Block a user