zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Virtuworks 2013-01-07 10:36:15 -05:00
commit f08daa89e4
1 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Users/UserController.cs
View file

@ -678,6 +678,12 @@ namespace WebsitePanel.EnterpriseServer
TaskManager.StartTask(taskId, "USER", "CHANGE_STATUS", user.Username); TaskManager.StartTask(taskId, "USER", "CHANGE_STATUS", user.Username);
TaskManager.ItemId = user.UserId; TaskManager.ItemId = user.UserId;
// update user packages
List<PackageInfo> packages = new List<PackageInfo>();
// Add the users package(s)
packages.AddRange(PackageController.GetPackages(userId));
try try
{ {
@ -699,19 +705,23 @@ namespace WebsitePanel.EnterpriseServer
List<UserInfo> children = GetUsers(userId, true); List<UserInfo> children = GetUsers(userId, true);
foreach (UserInfo child in children) foreach (UserInfo child in children)
{ {
result = ChangeUserStatusInternal(child.UserId, status); // Add the child users packages
packages.AddRange(PackageController.GetPackages(child.UserId));
// change child user peers
List<UserInfo> childPeers = GetUserPeers(child.UserId);
foreach (UserInfo peer in childPeers)
{
result = ChangeUserStatusInternal(peer.UserId, status);
if (result < 0) if (result < 0)
return result; return result;
} }
// update user packages // change child account
List<PackageInfo> packages = new List<PackageInfo>(); result = ChangeUserStatusInternal(child.UserId, status);
if (result < 0)
// his packages return result;
packages.AddRange(PackageController.GetMyPackages(userId)); }
// children packages
packages.AddRange(PackageController.GetPackages(userId));
PackageStatus packageStatus = PackageStatus.Active; PackageStatus packageStatus = PackageStatus.Active;
switch (status) switch (status)