1. Registered RDS provider
2. Added provider setting modify dialog 3. Added RDS quota
This commit is contained in:
dev_amdtel
parent
2b05f701dd
commit
fb64707187
8 changed files with 152 additions and 5 deletions
|
|
@ -2372,3 +2372,32 @@ UPDATE AdditionalGroups SET
|
|||
GroupName = @GroupName
|
||||
WHERE ID = @GroupID
|
||||
GO
|
||||
|
||||
|
||||
|
||||
-- Remote Desktop Services
|
||||
|
||||
-- RDS ResourceGroup
|
||||
|
||||
IF NOT EXISTS (SELECT * FROM [dbo].[ResourceGroups] WHERE [GroupName] = 'RDS')
|
||||
BEGIN
|
||||
INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController], [ShowGroup]) VALUES (45, N'RDS', 26, NULL, 1)
|
||||
END
|
||||
GO
|
||||
|
||||
-- RDS Quota
|
||||
|
||||
IF NOT EXISTS (SELECT * FROM [dbo].[Quotas] WHERE [QuotaName] = 'RDS.Users')
|
||||
BEGIN
|
||||
INSERT [dbo].[Quotas] ([QuotaID], [GroupID],[QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID]) VALUES (450, 45, 1, N'RDS.Users',N'Remote Desktop Users',2, 0 , NULL)
|
||||
END
|
||||
GO
|
||||
|
||||
-- RDS Provider
|
||||
|
||||
IF NOT EXISTS (SELECT * FROM [dbo].[Providers] WHERE [DisplayName] = 'Remote Desktop Services Windows 2012')
|
||||
BEGIN
|
||||
INSERT [dbo].[Providers] ([ProviderId], [GroupId], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery])
|
||||
VALUES(1501, 45, N'RemoteDesktopServices2012', N'Remote Desktop Services Windows 2012', N'WebsitePanel.Providers.RemoteDesktopServices.Windows2012,WebsitePanel.Providers.RemoteDesktopServices.Windows2012', N'RDS', 1)
|
||||
END
|
||||
GO
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ namespace WebsitePanel.Providers.Common
|
|||
|
||||
public const string AdministrationToolService = "AdministrationToolService";
|
||||
|
||||
|
||||
public const string UsersHome = "UsersHome";
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ using Microsoft.Win32;
|
|||
using WebsitePanel.Server.Utils;
|
||||
using WebsitePanel.Providers.Utils;
|
||||
using WebsitePanel.Providers.OS;
|
||||
using WebsitePanel.Providers.Common;
|
||||
|
||||
|
||||
namespace WebsitePanel.Providers.RemoteDesktopServices
|
||||
|
|
@ -45,7 +46,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
|
|||
#region Properties
|
||||
protected string UsersHome
|
||||
{
|
||||
get { return FileUtils.EvaluateSystemVariables(ProviderSettings["UsersHome"]); }
|
||||
get { return FileUtils.EvaluateSystemVariables(ProviderSettings[Constants.UsersHome]); }
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
@ -121,6 +122,9 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
|
|||
|
||||
public override bool IsInstalled()
|
||||
{
|
||||
// TODO: Remove it.
|
||||
return true;
|
||||
|
||||
Server.Utils.OS.WindowsVersion version = WebsitePanel.Server.Utils.OS.GetVersion();
|
||||
return version == WebsitePanel.Server.Utils.OS.WindowsVersion.WindowsServer2012;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5110,9 +5110,6 @@
|
|||
<data name="Quota.Exchange2007.RecoverableItemsSpace" xml:space="preserve">
|
||||
<value>Recoverable Items Storage, MB</value>
|
||||
</data>
|
||||
<data name="ResourceGroup.Exchange" xml:space="preserve">
|
||||
<value>Hosted Exchange</value>
|
||||
</data>
|
||||
<data name="EnterpriseStorage.DiskStorageSpace" xml:space="preserve">
|
||||
<value>Disk Storage Space, MB</value>
|
||||
</data>
|
||||
|
|
@ -5359,4 +5356,7 @@
|
|||
<data name="Success.ORGANIZATION_UPDATE_SECURITY_GROUP_SETTINGS" xml:space="preserve">
|
||||
<value>Group general settings have been successfully updated.</value>
|
||||
</data>
|
||||
<data name="ResourceGroup.RDS" xml:space="preserve">
|
||||
<value>Remote Desktop Services</value>
|
||||
</data>
|
||||
</root>
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="RDS_Settings.ascx.cs" Inherits="WebsitePanel.Portal.ProviderControls.RDS_Settings" %>
|
||||
<table>
|
||||
<tr>
|
||||
<td class="SubHead" width="150" nowrap>
|
||||
<asp:Label runat="server" ID="lblUsersHome" meta:resourcekey="lblUsersHome" Text="Users Home:"/>
|
||||
</td>
|
||||
<td>
|
||||
<asp:TextBox runat="server" ID="txtUsersHome" MaxLength="256" Width="200px" />
|
||||
<asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtUsersHome" Display="Dynamic" ErrorMessage="*" />
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
// Copyright (c) 2012, Outercurve Foundation.
|
||||
// All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without modification,
|
||||
// are permitted provided that the following conditions are met:
|
||||
//
|
||||
// - Redistributions of source code must retain the above copyright notice, this
|
||||
// list of conditions and the following disclaimer.
|
||||
//
|
||||
// - Redistributions in binary form must reproduce the above copyright notice,
|
||||
// this list of conditions and the following disclaimer in the documentation
|
||||
// and/or other materials provided with the distribution.
|
||||
//
|
||||
// - Neither the name of the Outercurve Foundation nor the names of its
|
||||
// contributors may be used to endorse or promote products derived from this
|
||||
// software without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
|
||||
// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||
// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
using System;
|
||||
using WebsitePanel.EnterpriseServer;
|
||||
using WebsitePanel.Providers.Common;
|
||||
|
||||
namespace WebsitePanel.Portal.ProviderControls
|
||||
{
|
||||
public partial class RDS_Settings : WebsitePanelControlBase, IHostingServiceProviderSettings
|
||||
{
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
}
|
||||
|
||||
public void BindSettings(System.Collections.Specialized.StringDictionary settings)
|
||||
{
|
||||
txtUsersHome.Text = settings[Constants.UsersHome];
|
||||
}
|
||||
|
||||
public void SaveSettings(System.Collections.Specialized.StringDictionary settings)
|
||||
{
|
||||
settings[Constants.UsersHome] = txtUsersHome.Text;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
//------------------------------------------------------------------------------
|
||||
// <автоматически создаваемое>
|
||||
// Этот код создан программой.
|
||||
//
|
||||
// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
|
||||
// повторной генерации кода.
|
||||
// </автоматически создаваемое>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace WebsitePanel.Portal.ProviderControls {
|
||||
|
||||
|
||||
public partial class RDS_Settings {
|
||||
|
||||
/// <summary>
|
||||
/// lblUsersHome элемент управления.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Автоматически создаваемое поле.
|
||||
/// Для изменения переместите объявление поля из файла конструктора в файл кода программной части.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label lblUsersHome;
|
||||
|
||||
/// <summary>
|
||||
/// txtUsersHome элемент управления.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Автоматически создаваемое поле.
|
||||
/// Для изменения переместите объявление поля из файла конструктора в файл кода программной части.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.TextBox txtUsersHome;
|
||||
|
||||
/// <summary>
|
||||
/// RequiredFieldValidator1 элемент управления.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Автоматически создаваемое поле.
|
||||
/// Для изменения переместите объявление поля из файла конструктора в файл кода программной части.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
|
||||
}
|
||||
}
|
||||
|
|
@ -479,6 +479,13 @@
|
|||
<DependentUpon>Lync_Settings.ascx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ProviderControls\RDS_Settings.ascx.cs">
|
||||
<DependentUpon>RDS_Settings.ascx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ProviderControls\RDS_Settings.ascx.designer.cs">
|
||||
<DependentUpon>RDS_Settings.ascx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ServersEditWebPlatformInstaller.ascx.cs">
|
||||
<DependentUpon>ServersEditWebPlatformInstaller.ascx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
|
|
@ -4021,6 +4028,7 @@
|
|||
<Content Include="ProviderControls\CRM2011_Settings.ascx" />
|
||||
<Content Include="ProviderControls\EnterpriseStorage_Settings.ascx" />
|
||||
<Content Include="ProviderControls\HeliconZoo_Settings.ascx" />
|
||||
<Content Include="ProviderControls\RDS_Settings.ascx" />
|
||||
<Content Include="ServersEditWebPlatformInstaller.ascx" />
|
||||
<Content Include="ExchangeServer\ExchangeMailboxPlans.ascx" />
|
||||
<Content Include="ExchangeServer\UserControls\AccountsListWithPermissions.ascx" />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue