diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-02-19 18:10:35 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-02-19 18:10:35 +0200 |
| commit | 945520000da0ae4a3fa3b40e9756d67379e25314 (patch) | |
| tree | 5d0b88721a2eb6a6805cf10fb08cce3f486e2928 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB | |
| parent | 93e6a6bfa7238826dcdea989e279ec3450067f83 (diff) | |
| download | Tango-945520000da0ae4a3fa3b40e9756d67379e25314.tar.gz Tango-945520000da0ae4a3fa3b40e9756d67379e25314.zip | |
Machine Studio v4.0.8.0
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; } |