Changeset 7936

Timestamp:

05/30/12 16:58:04 (12 years ago)

Author:

ascheibe

Message:

#1648 fixed a bug when retrieving the groups for a user

Location:

branches/ClientUserManagement

Files:

• HeuristicLab.Clients.Access/3.3/UserInformation.cs (modified) (3 diffs)
• HeuristicLab.Services.Access/3.3/AccessService.cs (modified) (1 diff)

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/UserInformation.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.ServiceModel.Security;
 
@@ -49 +48 @@
     }
 
-    //the groups a user is in
-    private List<UserGroup> groups;
-    public List<UserGroup> Groups {
-      get { return groups; }
-    }
-
-    //the roles a user has
-    private List<Role> roles;
-    public List<Role> Roles {
-      get { return roles; }
-    }
-
     private bool errorOccured;
     public bool ErrorOccured {
@@ -83 +70 @@
       try {
         AccessClient.CallAccessService(x => user = x.Login());
-        //TODO: get rid of the next 2 calls
-        AccessClient.CallAccessService(x => groups = x.GetGroupsOfCurrentUser());
-        AccessClient.CallAccessService(x => roles = x.GetRolesOfCurrentUser());
         errorOccured = false;
         userExists = true;

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/AccessService.cs

@@ -378 +378 @@
             accessUser = query.First();
             groups = (from ug in context.UserGroupUserGroups
-                      where ug.UserGroupUserGroupId == accessUser.Id
-                      join g in context.UserGroupBases.OfType<DA.UserGroup>() on ug.UserGroupId equals g.Id
+                      where ug.UserGroupId == accessUser.Id
+                      join g in context.UserGroupBases.OfType<DA.UserGroup>() on ug.UserGroupUserGroupId equals g.Id
                       select g).ToList();
           } else {