diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-02-20 08:55:29 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-02-20 08:55:29 +0200 |
| commit | a23cfede23d891712d2a2b840373075968f08994 (patch) | |
| tree | 3ca77277ffaf20f4a4332b2321e913553bf1e300 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB | |
| parent | 38009a30108ff250ac4884bf85a89014db27b3bd (diff) | |
| parent | b740f2922a16a3df2897a4acbfca94bb87685045 (diff) | |
| download | Tango-a23cfede23d891712d2a2b840373075968f08994.tar.gz Tango-a23cfede23d891712d2a2b840373075968f08994.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
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; } |