diff options
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB')
2 files changed, 2 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/UsersRolesToStringConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/UsersRolesToStringConverter.cs index 374fe78a3..e607b13d5 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/UsersRolesToStringConverter.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/UsersRolesToStringConverter.cs @@ -24,7 +24,7 @@ namespace Tango.MachineStudio.DB.Converters if (value is IEnumerable<UsersRole>) { IEnumerable<UsersRole> userRoles = value as IEnumerable<UsersRole>; - return String.Join(", ", userRoles.Where(x => !x.Deleted).Select(x => x.Role.Name)); + return String.Join(", ", userRoles.Select(x => x.Role.Name)); } else { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs index 6c98227e3..5606d9da8 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs @@ -30,7 +30,7 @@ namespace Tango.MachineStudio.DB.ViewModels foreach (var role in SelectedRoles) { - if (SelectedEntity.UsersRoles.ToList().Exists(x => x.Role == role.Entity && !x.Deleted)) + if (SelectedEntity.UsersRoles.ToList().Exists(x => x.Role == role.Entity)) { role.IsSelected = true; } |