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

Merge problems fixing

Browse source
This commit is contained in:
vfedosevich 2015-01-21 02:47:40 -08:00
commit 3dcf48966a
5 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/OrganizationProxy.cs
View file

@ -20,6 +20,7 @@ namespace WebsitePanel.EnterpriseServer.HostedSolution {
using System.Diagnostics; using System.Diagnostics;
using System.Data; using System.Data;
using WebsitePanel.Providers.HostedSolution; using WebsitePanel.Providers.HostedSolution;
using WebsitePanel.Providers.Common;
using WebsitePanel.EnterpriseServer.Base.HostedSolution; using WebsitePanel.EnterpriseServer.Base.HostedSolution;
using WebsitePanel.Providers.ResultObjects; using WebsitePanel.Providers.ResultObjects;
using WebsitePanel.Providers; using WebsitePanel.Providers;

2
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
View file

@ -3208,7 +3208,7 @@ namespace WebsitePanel.EnterpriseServer
"GetOrganizationDeletedUser", "GetOrganizationDeletedUser",
new SqlParameter("@AccountID", accountId) new SqlParameter("@AccountID", accountId)
); );
} }
public static IDataReader GetAdditionalGroups(int userId) public static IDataReader GetAdditionalGroups(int userId)
{ {

16
WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationStatistics.cs
View file

@ -376,19 +376,12 @@ namespace WebsitePanel.Providers.HostedSolution
set { createdResourceMailboxes = value; } 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 public int AllocatedDeletedUsers
{ {
get { return allocatedDeletedUsers; } get { return allocatedDeletedUsers; }
set { allocatedDeletedUsers = value; } set { allocatedDeletedUsers = value; }
} }
public int DeletedUsers public int DeletedUsers
{ {
get { return deletedUsers; } get { return deletedUsers; }
@ -405,6 +398,13 @@ namespace WebsitePanel.Providers.HostedSolution
get { return usedDeletedUsersBackupStorageSpace; } get { return usedDeletedUsersBackupStorageSpace; }
set { usedDeletedUsersBackupStorageSpace = value; } 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; }
} }
} }

2
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config
View file

@ -579,7 +579,7 @@
<Control key="view_deleted_user" src="WebsitePanel/ExchangeServer/OrganizationDeletedUserGeneralSettings.ascx" title="OrganizationDeletedUserGeneralSettings" type="View" /> <Control key="view_deleted_user" src="WebsitePanel/ExchangeServer/OrganizationDeletedUserGeneralSettings.ascx" title="OrganizationDeletedUserGeneralSettings" type="View" />
<Control key="deleted_user_memberof" src="WebsitePanel/ExchangeServer/OrganizationDeletedUserMemberOf.ascx" title="DeletedUserMemberOf" type="View" /> <Control key="deleted_user_memberof" src="WebsitePanel/ExchangeServer/OrganizationDeletedUserMemberOf.ascx" title="DeletedUserMemberOf" type="View" />
<Control key="rds_application_edit_users" src="WebsitePanel/RDS/RDSEditApplicationUsers.ascx" title="RDSEditApplicationUsers" type="View" /> <Control key="rds_application_edit_users" src="WebsitePanel/RDS/RDSEditApplicationUsers.ascx" title="RDSEditApplicationUsers" type="View" />
<Control key="rds_edit_collection" src="WebsitePanel/RDS/RDSEditCollection.ascx" title="RDSEditCollection" type="View" /> <Control key="rds_edit_collection" src="WebsitePanel/RDS/RDSEditCollection.ascx" title="RDSEditCollection" type="View" />
</Controls> </Controls>
</ModuleDefinition> </ModuleDefinition>

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationHome.ascx.resx
View file

@ -227,7 +227,7 @@
</data> </data>
<data name="locRemoteDesktop.Text" xml:space="preserve"> <data name="locRemoteDesktop.Text" xml:space="preserve">
<value>Remote Desktop</value> <value>Remote Desktop</value>
</data> </data>
<data name="lnkRdsServers.Text" xml:space="preserve"> <data name="lnkRdsServers.Text" xml:space="preserve">
<value>RDS Servers</value> <value>RDS Servers</value>
</data> </data>