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

Web app Gallery: 'ignore dependency fail' checkbox removed, warning message updated

Browse source
This commit is contained in:
ruslanht 2012-12-13 14:17:15 +02:00
parent aa3a358e46
commit 934a5a9107
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
View file

@ -4868,7 +4868,7 @@
<value>Web site "{1}" was not found</value> <value>Web site "{1}" was not found</value>
</data> </data>
<data name="Warning.WAG_CANNOT_INSTALL_APPLICATION" xml:space="preserve"> <data name="Warning.WAG_CANNOT_INSTALL_APPLICATION" xml:space="preserve">
<value>Selected application cannot be installed.</value> <value>Following dependencies may be missing:</value>
</data> </data>
<data name="WebAppGallery.AspNet20Required" xml:space="preserve"> <data name="WebAppGallery.AspNet20Required" xml:space="preserve">
<value>ASP.NET 2.0</value> <value>ASP.NET 2.0</value>

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryInstall.ascx
View file

@ -16,7 +16,8 @@
<asp:CheckBox ID="chIgnoreDependencies" runat="server" <asp:CheckBox ID="chIgnoreDependencies" runat="server"
Text="Ignore dependency fail and install selected product anyway." Visible="false" AutoPostBack="True" Text="Ignore dependency fail and install selected product anyway." Visible="false" AutoPostBack="True"
oncheckedchanged="chIgnoreDependencies_CheckedChanged" /> oncheckedchanged="chIgnoreDependencies_CheckedChanged" />
</div> </div>
<div class="FormFooter"> <div class="FormFooter">
<asp:Button ID="btnInstall" runat="server" meta:resourcekey="btnInstall" Text="Install" CssClass="Button1" OnClick="btnInstall_Click" OnClientClick="ShowProgressDialog('Installing application...');"/> <asp:Button ID="btnInstall" runat="server" meta:resourcekey="btnInstall" Text="Install" CssClass="Button1" OnClick="btnInstall_Click" OnClientClick="ShowProgressDialog('Installing application...');"/>

9
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryInstall.ascx.cs
View file

@ -64,9 +64,14 @@ namespace WebsitePanel.Portal
if (appResult.ErrorCodes.Count > 0) if (appResult.ErrorCodes.Count > 0)
{ {
// app does not meet requirements // app does not meet requirements
if (appResult.ErrorCodes.Count > 1)
{
// remove "- Your hosting package does not meet..." message
appResult.ErrorCodes.RemoveAt(0);
}
messageBox.ShowMessage(appResult, "WAG_CANNOT_INSTALL_APPLICATION", "WebAppGallery"); messageBox.ShowMessage(appResult, "WAG_CANNOT_INSTALL_APPLICATION", "WebAppGallery");
chIgnoreDependencies.Visible = true; chIgnoreDependencies.Visible = false;
btnInstall.Enabled = false; btnInstall.Enabled = true;
} }
} }
catch (Exception ex) catch (Exception ex)