merge commit
This commit is contained in:
commit
dd462e4c6a
37 changed files with 8177 additions and 666 deletions
|
@ -89,10 +89,12 @@ span.ValidationMessageBlock {
|
|||
|
||||
<fieldset>
|
||||
<legend>
|
||||
<span>Helicon Zoo engine quotas settings</span>
|
||||
<span>Helicon Zoo settings</span>
|
||||
</legend>
|
||||
<div class="FormBody">
|
||||
<asp:CheckBox runat="server" ID="QuotasEnabled" Text="Enable Quotas"/>
|
||||
<asp:CheckBox runat="server" ID="QuotasEnabled" Text="Enable hosting plan controls for web engines."/>
|
||||
<br />
|
||||
<asp:CheckBox runat="server" ID="WebCosoleEnabled" Text="Enable web console."/>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
|
|
|
@ -68,7 +68,7 @@ public partial class HeliconZoo_Settings : WebsitePanelControlBase, IHostingServ
|
|||
|
||||
private void BindHostingPackages()
|
||||
{
|
||||
// TODO: try...catch?
|
||||
|
||||
WPIProduct[] products = null;
|
||||
try
|
||||
{
|
||||
|
@ -92,6 +92,12 @@ public partial class HeliconZoo_Settings : WebsitePanelControlBase, IHostingServ
|
|||
|
||||
private void BindEngines()
|
||||
{
|
||||
WPIProduct zooModule = ES.Services.Servers.GetWPIProductById(PanelRequest.ServerId, "HeliconZooModule");
|
||||
if (!zooModule.IsInstalled || zooModule.IsUpgrade)
|
||||
{
|
||||
HostModule.ShowWarningMessage("Zoo Module is not installed or out-of-date. To proceed press 'Add' or 'Update' next to Helicon Zoo Module below, then press 'Install'.");
|
||||
}
|
||||
|
||||
// get all engines from IIS
|
||||
HeliconZooEngine[] engineList = ES.Services.HeliconZoo.GetEngines(PanelRequest.ServiceId);
|
||||
|
||||
|
@ -114,6 +120,8 @@ public partial class HeliconZoo_Settings : WebsitePanelControlBase, IHostingServ
|
|||
// bind 'Enable quotas' checkbox
|
||||
bool enabled = ES.Services.HeliconZoo.IsEnginesEnabled(PanelRequest.ServiceId);
|
||||
QuotasEnabled.Checked = !enabled;
|
||||
|
||||
WebCosoleEnabled.Checked = ES.Services.HeliconZoo.IsWebCosoleEnabled(PanelRequest.ServiceId);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -139,6 +147,8 @@ public partial class HeliconZoo_Settings : WebsitePanelControlBase, IHostingServ
|
|||
|
||||
// save switcher
|
||||
ES.Services.HeliconZoo.SwithEnginesEnabled(PanelRequest.ServiceId, !QuotasEnabled.Checked);
|
||||
|
||||
ES.Services.HeliconZoo.SetWebCosoleEnabled(PanelRequest.ServiceId, WebCosoleEnabled.Checked);
|
||||
}
|
||||
|
||||
protected void ClearEngineForm()
|
||||
|
@ -390,7 +400,15 @@ public partial class HeliconZoo_Settings : WebsitePanelControlBase, IHostingServ
|
|||
|
||||
private static WPIProduct[] RequestHostingPackages()
|
||||
{
|
||||
return ES.Services.Servers.GetWPIProducts(PanelRequest.ServerId, null, "ZooPackage");
|
||||
List<WPIProduct> result = new List<WPIProduct>();
|
||||
result.Add(ES.Services.Servers.GetWPIProductById(PanelRequest.ServerId, "HeliconZooModule"));
|
||||
result.AddRange(ES.Services.Servers.GetWPIProducts(PanelRequest.ServerId, null, "ZooPackage"));
|
||||
|
||||
|
||||
|
||||
|
||||
return result.ToArray();
|
||||
|
||||
}
|
||||
|
||||
protected string AddUpgradeRemoveText(WPIProduct wpiProduct)
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
|
@ -84,6 +85,15 @@ public partial class HeliconZoo_Settings {
|
|||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label HostingPackagesLoadingError;
|
||||
|
||||
/// <summary>
|
||||
/// EnginesPanel control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Panel EnginesPanel;
|
||||
|
||||
/// <summary>
|
||||
/// QuotasEnabled control.
|
||||
/// </summary>
|
||||
|
@ -94,13 +104,13 @@ public partial class HeliconZoo_Settings {
|
|||
protected global::System.Web.UI.WebControls.CheckBox QuotasEnabled;
|
||||
|
||||
/// <summary>
|
||||
/// EnginesPanel control.
|
||||
/// WebCosoleEnabled control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Panel EnginesPanel;
|
||||
protected global::System.Web.UI.WebControls.CheckBox WebCosoleEnabled;
|
||||
|
||||
/// <summary>
|
||||
/// ButtonAddEngine control.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue