Changeset 7936
- Timestamp:
- 05/30/12 16:58:04 (12 years ago)
- Location:
- branches/ClientUserManagement
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/UserInformation.cs
r7611 r7936 21 21 22 22 using System; 23 using System.Collections.Generic;24 23 using System.ServiceModel.Security; 25 24 … … 49 48 } 50 49 51 //the groups a user is in52 private List<UserGroup> groups;53 public List<UserGroup> Groups {54 get { return groups; }55 }56 57 //the roles a user has58 private List<Role> roles;59 public List<Role> Roles {60 get { return roles; }61 }62 63 50 private bool errorOccured; 64 51 public bool ErrorOccured { … … 83 70 try { 84 71 AccessClient.CallAccessService(x => user = x.Login()); 85 //TODO: get rid of the next 2 calls86 AccessClient.CallAccessService(x => groups = x.GetGroupsOfCurrentUser());87 AccessClient.CallAccessService(x => roles = x.GetRolesOfCurrentUser());88 72 errorOccured = false; 89 73 userExists = true; -
branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/AccessService.cs
r7651 r7936 378 378 accessUser = query.First(); 379 379 groups = (from ug in context.UserGroupUserGroups 380 where ug.UserGroup UserGroupId == accessUser.Id381 join g in context.UserGroupBases.OfType<DA.UserGroup>() on ug.UserGroup Id equals g.Id380 where ug.UserGroupId == accessUser.Id 381 join g in context.UserGroupBases.OfType<DA.UserGroup>() on ug.UserGroupUserGroupId equals g.Id 382 382 select g).ToList(); 383 383 } else {
Note: See TracChangeset
for help on using the changeset viewer.