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

Fixed: OrganizationUsers deleted from the AD will throw exception in users pages

Browse source 
list within the portal.

List shows up, organization user can be deleted from the websitepanel through
the portal
This commit is contained in:
robvde 2012-08-10 10:49:07 +04:00
parent 42b2912a5b
commit 12d0e687f1
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/HostedSolution/OrganizationController.cs
View file

@ -1172,7 +1172,10 @@ namespace WebsitePanel.EnterpriseServer
foreach (OrganizationUser user in Tmpaccounts.ToArray()) foreach (OrganizationUser user in Tmpaccounts.ToArray())
{ {
accounts.Add(GetUserGeneralSettings(itemId, user.AccountId)); OrganizationUser tmpUser = GetUserGeneralSettings(itemId, user.AccountId);
if (tmpUser != null)
accounts.Add(tmpUser);
} }
result.PageUsers = accounts.ToArray(); result.PageUsers = accounts.ToArray();
@ -1536,15 +1539,23 @@ namespace WebsitePanel.EnterpriseServer
TaskManager.StartTask("ORGANIZATION", "GET_USER_GENERAL"); TaskManager.StartTask("ORGANIZATION", "GET_USER_GENERAL");
TaskManager.ItemId = itemId; TaskManager.ItemId = itemId;
OrganizationUser account = null;
Organization org = null;
try try
{ {
// load organization // load organization
Organization org = GetOrganization(itemId); org = GetOrganization(itemId);
if (org == null) if (org == null)
return null; return null;
// load account // load account
OrganizationUser account = GetAccount(itemId, accountId); account = GetAccount(itemId, accountId);
}
catch (Exception){}
try
{
// get mailbox settings // get mailbox settings
Organizations orgProxy = GetOrganizationProxy(org.ServiceId); Organizations orgProxy = GetOrganizationProxy(org.ServiceId);
@ -1566,12 +1577,14 @@ namespace WebsitePanel.EnterpriseServer
} }
catch (Exception ex) catch (Exception ex)
{ {
throw TaskManager.WriteError(ex); //throw TaskManager.WriteError(ex);
} }
finally finally
{ {
TaskManager.CompleteTask(); TaskManager.CompleteTask();
} }
return (account);
} }
public static int SetUserGeneralSettings(int itemId, int accountId, string displayName, public static int SetUserGeneralSettings(int itemId, int accountId, string displayName,