- Timestamp:
- 12/10/08 14:10:52 (16 years ago)
- Location:
- trunk/sources
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Hive.Contracts/BusinessObjects/PermissionOwner.cs
r845 r939 34 34 [DataMember] 35 35 public string Name { get; set; } 36 36 37 public override bool Equals(object obj) { 38 if (obj is PermissionOwner) 39 return this.PermissionOwnerId.Equals( 40 (obj as PermissionOwner).PermissionOwnerId); 41 else 42 return base.Equals(obj); 43 } 44 45 public override int GetHashCode() { 46 return this.PermissionOwnerId.GetHashCode(); 47 } 37 48 } 38 49 } -
trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/PermissionOwnerAdapter.cs
r925 r939 152 152 if(row != null) { 153 153 data.RemovePermissionOwnerRow(row); 154 154 155 155 return true; 156 156 } -
trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/UserAdapter.cs
r925 r939 39 39 private IPermissionOwnerAdapter permOwnerAdapter = 40 40 ServiceLocator.GetPermissionOwnerAdapter(); 41 42 private IUserGroupAdapter userGroupAdapter = null; 41 43 42 44 public UserAdapter() { … … 150 152 151 153 if (row != null) { 154 if (userGroupAdapter == null) 155 userGroupAdapter = 156 ServiceLocator.GetUserGroupAdapter(); 157 158 ICollection<UserGroup> userGroups = 159 userGroupAdapter.MemberOf(user); 160 161 foreach (UserGroup group in userGroups) { 162 group.Members.Remove(user); 163 userGroupAdapter.UpdateUserGroup(group); 164 } 165 152 166 data.RemoveHiveUserRow(row); 153 167 -
trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/UserGroupAdapter.cs
r936 r939 28 28 using HeuristicLab.Hive.Contracts.BusinessObjects; 29 29 using System.Runtime.CompilerServices; 30 using System.Data; 30 31 31 32 namespace HeuristicLab.Hive.Server.ADODataAccess { … … 169 170 foreach (dsHiveServer.PermissionOwner_UserGroupRow permOwnerUserGroupRow in 170 171 userGroupRows) { 171 PermissionOwner permOwner = userGroup.Members.Single<PermissionOwner>( 172 p => p.PermissionOwnerId == permOwnerUserGroupRow.PermissionOwnerId); 172 PermissionOwner permOwner = null; 173 174 IEnumerable<PermissionOwner> permOwners = 175 from p in 176 userGroup.Members 177 where p.PermissionOwnerId == permOwnerUserGroupRow.PermissionOwnerId 178 select p; 179 180 if (permOwners.Count<PermissionOwner>() == 1) 181 permOwner = permOwners.First<PermissionOwner>(); 173 182 174 183 if (permOwner == null) { … … 234 243 235 244 return allUserGroups; 245 } 246 247 public ICollection<UserGroup> MemberOf(PermissionOwner permOwner) { 248 ICollection<UserGroup> userGroups = 249 new List<UserGroup>(); 250 251 if (permOwner != null) { 252 IEnumerable<dsHiveServer.PermissionOwner_UserGroupRow> userGroupRows = 253 from userGroup in 254 permOwnerUserGroupData.AsEnumerable<dsHiveServer.PermissionOwner_UserGroupRow>() 255 where userGroup.PermissionOwnerId == permOwner.PermissionOwnerId 256 select userGroup; 257 258 foreach (dsHiveServer.PermissionOwner_UserGroupRow userGroupRow in 259 userGroupRows) { 260 UserGroup userGroup = 261 GetUserGroupById(userGroupRow.UserGroupId); 262 userGroups.Add(userGroup); 263 } 264 } 265 266 return userGroups; 236 267 } 237 268 … … 249 280 permOwnerUserGroupData) { 250 281 if (permOwnerUserGroupRow.UserGroupId == group.PermissionOwnerId || 251 282 permOwnerUserGroupRow.PermissionOwnerId == group.PermissionOwnerId) { 252 283 deleted.Add(permOwnerUserGroupRow); 253 284 } -
trunk/sources/HeuristicLab.Hive.Server.Core/DbTestApp.cs
r936 r939 114 114 user2.Name = "Martin"; 115 115 116 User user3 = 117 new User(); 118 user3.Name = "Heinz"; 119 116 120 UserGroup group = 117 121 new UserGroup(); … … 121 125 subGroup.Members.Add(user); 122 126 127 group.Members.Add(user3); 123 128 group.Members.Add(user2); 124 129 group.Members.Add(subGroup); … … 132 137 userGroupAdapter.GetAllUserGroups(); 133 138 139 IUserAdapter userAdapter = 140 ServiceLocator.GetUserAdapter(); 141 142 userAdapter.DeleteUser(user3); 143 144 read = 145 userGroupAdapter.GetUserGroupById(group.PermissionOwnerId); 146 134 147 userGroupAdapter.DeleteUserGroup(subGroup); 148 149 read = 150 userGroupAdapter.GetUserGroupById(group.PermissionOwnerId); 135 151 136 152 userGroups = 137 153 userGroupAdapter.GetAllUserGroups(); 138 139 read =140 userGroupAdapter.GetUserGroupById(group.PermissionOwnerId);141 154 142 155 userGroupAdapter.DeleteUserGroup(group); … … 144 157 userGroups = 145 158 userGroupAdapter.GetAllUserGroups(); 146 147 IUserAdapter userAdapter =148 ServiceLocator.GetUserAdapter();149 159 150 160 userAdapter.DeleteUser(user); -
trunk/sources/HeuristicLab.Hive.Server.Core/InternalInterfaces/DataAccess/IUserGroupAdapter.cs
r910 r939 51 51 52 52 /// <summary> 53 /// Gets all user groups where the permission owner is member of 54 /// </summary> 55 /// <param name="permOwner"></param> 56 /// <returns></returns> 57 ICollection<UserGroup> MemberOf(PermissionOwner permOwner); 58 59 /// <summary> 53 60 /// Deletes the user group 54 61 /// </summary>
Note: See TracChangeset
for help on using the changeset viewer.