From 934a5a91071c7a4399771994211b97fbe6014dd1 Mon Sep 17 00:00:00 2001
From: ruslanht <ruslan@helicontech.com>
Date: Thu, 13 Dec 2012 14:17:15 +0200
Subject: [PATCH] Web app Gallery: 'ignore dependency fail' checkbox removed,
 warning message updated

---
 .../WebsitePanel_SharedResources.ascx.resx               | 2 +-
 .../WebsitePanel/WebApplicationGalleryInstall.ascx       | 3 ++-
 .../WebsitePanel/WebApplicationGalleryInstall.ascx.cs    | 9 +++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
index f90f4aca..c676ac95 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
@@ -4868,7 +4868,7 @@
     <value>Web site "{1}" was not found</value>
   </data>
   <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 name="WebAppGallery.AspNet20Required" xml:space="preserve">
     <value>ASP.NET 2.0</value>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryInstall.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryInstall.ascx
index cb96198b..94985211 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryInstall.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryInstall.ascx
@@ -16,7 +16,8 @@
     <asp:CheckBox ID="chIgnoreDependencies" runat="server"  
         Text="Ignore dependency fail and install selected product anyway."  Visible="false" AutoPostBack="True" 
         oncheckedchanged="chIgnoreDependencies_CheckedChanged" />
-	
+        
+
 </div>
 <div class="FormFooter">
     <asp:Button ID="btnInstall" runat="server" meta:resourcekey="btnInstall" Text="Install" CssClass="Button1" OnClick="btnInstall_Click" OnClientClick="ShowProgressDialog('Installing application...');"/>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryInstall.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryInstall.ascx.cs
index 6d20c6a8..caa57525 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryInstall.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryInstall.ascx.cs
@@ -64,9 +64,14 @@ namespace WebsitePanel.Portal
                 if (appResult.ErrorCodes.Count > 0)
                 {
                     // 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");
-                    chIgnoreDependencies.Visible = true;
-                    btnInstall.Enabled = false;
+                    chIgnoreDependencies.Visible = false;
+                    btnInstall.Enabled = true;
                 }
             }
             catch (Exception ex)