diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/OrganizationProxy.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/OrganizationProxy.cs index 2506df9a..a0df6615 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/OrganizationProxy.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/OrganizationProxy.cs @@ -20,6 +20,7 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution { using System.Diagnostics; using System.Data; using WebsitePanel.Providers.HostedSolution; + using WebsitePanel.Providers.Common; using WebsitePanel.EnterpriseServer.Base.HostedSolution; using WebsitePanel.Providers.ResultObjects; using WebsitePanel.Providers; diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs index 5717ee73..137defe7 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs @@ -3208,7 +3208,7 @@ namespace WebsitePanel.EnterpriseServer "GetOrganizationDeletedUser", new SqlParameter("@AccountID", accountId) ); - } + } public static IDataReader GetAdditionalGroups(int userId) { diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationStatistics.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationStatistics.cs index 41a9aa09..56923206 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationStatistics.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationStatistics.cs @@ -376,19 +376,12 @@ namespace WebsitePanel.Providers.HostedSolution set { createdResourceMailboxes = value; } } - public int CreatedRdsServers { get; set; } - public int CreatedRdsCollections { get; set; } - public int CreatedRdsUsers { get; set; } - public int AllocatedRdsServers { get; set; } - public int AllocatedRdsCollections { get; set; } - public int AllocatedRdsUsers { get; set; } - public int AllocatedDeletedUsers { get { return allocatedDeletedUsers; } set { allocatedDeletedUsers = value; } } - + public int DeletedUsers { get { return deletedUsers; } @@ -405,6 +398,13 @@ namespace WebsitePanel.Providers.HostedSolution get { return usedDeletedUsersBackupStorageSpace; } set { usedDeletedUsersBackupStorageSpace = value; } } + + public int CreatedRdsServers { get; set; } + public int CreatedRdsCollections { get; set; } + public int CreatedRdsUsers { get; set; } + public int AllocatedRdsServers { get; set; } + public int AllocatedRdsCollections { get; set; } + public int AllocatedRdsUsers { get; set; } } } diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config index 6d6e7624..d2caf292 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config @@ -579,7 +579,7 @@ - + diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationHome.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationHome.ascx.resx index 3121764b..f71acc7e 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationHome.ascx.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationHome.ascx.resx @@ -227,7 +227,7 @@ Remote Desktop - + RDS Servers