diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
index 3fe17033..27ccc76f 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
@@ -2581,7 +2581,10 @@ namespace WebsitePanel.EnterpriseServer
OrganizationSecurityGroup tmpSecurityGroup = GetSecurityGroupGeneralSettings(itemId, account.AccountId);
if (tmpSecurityGroup != null)
+ {
+ account.Notes = tmpSecurityGroup.Notes;
accounts.Add(account);
+ }
}
result.PageItems = accounts.ToArray();
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeAccount.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeAccount.cs
index c3299d67..58b9e55b 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeAccount.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeAccount.cs
@@ -50,6 +50,7 @@ namespace WebsitePanel.Providers.HostedSolution
string mailboxPlan;
string publicFolderPermission;
string userPrincipalName;
+ string notes;
public int AccountId
{
@@ -149,5 +150,10 @@ namespace WebsitePanel.Providers.HostedSolution
set { this.userPrincipalName = value; }
}
+ public string Notes
+ {
+ get { return this.notes; }
+ set { this.notes = value; }
+ }
}
}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationSecurityGroups.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationSecurityGroups.ascx.resx
index e549521d..783d8cc6 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationSecurityGroups.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationSecurityGroups.ascx.resx
@@ -150,4 +150,7 @@
Groups
+
+ Notes
+
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx
index 13dcbc4c..22198532 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx
@@ -49,11 +49,11 @@
-
+
@@ -61,6 +61,7 @@
+
_NotesMaxLength)
+ {
+ e.Row.Cells[1].Text = e.Row.Cells[1].Text.Substring(0, _NotesMaxLength - 3) + "...";
+ }
+ }
+
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
gvGroups.PageSize = Convert.ToInt16(ddlPageSize.SelectedValue);