From edcb079ad99bfeaf91286340a71b1162edf48211 Mon Sep 17 00:00:00 2001 From: Ruslan Keba Date: Mon, 7 Oct 2013 13:19:49 +0300 Subject: [PATCH 1/8] Web App Gallery Installer problems with select language fixed --- .../WebsitePanel.Server/Code/WPIHelper.cs | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.Server/Code/WPIHelper.cs b/WebsitePanel/Sources/WebsitePanel.Server/Code/WPIHelper.cs index 11efc0b7..a6b84657 100644 --- a/WebsitePanel/Sources/WebsitePanel.Server/Code/WPIHelper.cs +++ b/WebsitePanel/Sources/WebsitePanel.Server/Code/WPIHelper.cs @@ -520,7 +520,7 @@ namespace WebsitePanel.Server.Code { Product app = GetProduct(appId); - Installer appInstaller = app.GetInstaller(GetLanguage(languageId)); + Installer appInstaller = GetInstaller(languageId, app); WpiAppInstallLogger logger = new WpiAppInstallLogger(); /* @@ -586,6 +586,25 @@ namespace WebsitePanel.Server.Code return !logger.IsFailed; } + private Installer GetInstaller(string languageId, Product product) + { + Installer installer = product.GetInstaller(GetLanguage(languageId)); + if (null == installer) + { + installer = product.GetInstaller(GetLanguage(DeafultLanguage)); + if (null == installer) + { + throw new Exception( + string.Format( + "Could not get installer for product '{0}', language: {1}, default language: {2}", + product.Title, languageId, DeafultLanguage) + ); + } + } + + return installer; + } + #endregion #endregion Public interface @@ -701,10 +720,11 @@ namespace WebsitePanel.Server.Code private List GetInstallers(List productsToInstall, Language lang) { + Language defaultLang = GetLanguage(DeafultLanguage); List installersToUse = new List(); foreach (Product product in productsToInstall) { - Installer installer = product.GetInstaller(lang); + Installer installer = product.GetInstaller(lang) ?? product.GetInstaller(defaultLang); if (null != installer) { installersToUse.Add(installer); From 789da9cf6e7c4ba01c1314ef4b4c802859c4bc00 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Mon, 7 Oct 2013 09:03:53 -0400 Subject: [PATCH 2/8] Added tag build-2.1.0.180 for changeset 98b290a48d84 From 43238c046630c5fca8b303dfa66bef7373455f98 Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Tue, 8 Oct 2013 11:44:21 +0300 Subject: [PATCH 3/8] fix creating hosting space --- .../Packages/PackageController.cs | 4 +-- .../SystemEventHandlers.config | 26 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs index b8532151..522ab4e6 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs @@ -619,7 +619,7 @@ namespace WebsitePanel.EnterpriseServer BackgroundTask topTask = TaskManager.TopTask; - topTask.ItemId = userId; + topTask.ItemId = result.Result; topTask.UpdateParamValue("SendLetter", sendLetter); TaskController.UpdateTaskWithParams(topTask); @@ -724,7 +724,7 @@ namespace WebsitePanel.EnterpriseServer BackgroundTask topTask = TaskManager.TopTask; - topTask.ItemId = userId; + topTask.ItemId = result.Result; topTask.UpdateParamValue("Signup", signup); topTask.UpdateParamValue("UserId", userId); topTask.UpdateParamValue("SendLetter", sendLetter); diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/SystemEventHandlers.config b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/SystemEventHandlers.config index 156bd913..50c56886 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/SystemEventHandlers.config +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/SystemEventHandlers.config @@ -1,36 +1,36 @@ - + - + - + - - + + - + - - + + - - + + - + - + - + From b1c67b8f22317f559390ddd1a42cce00b89614d3 Mon Sep 17 00:00:00 2001 From: Christopher York Date: Tue, 8 Oct 2013 10:56:18 -0500 Subject: [PATCH 4/8] Fixed: Null reference exception --- .../DesktopModules/WebsitePanel/SystemSettings.ascx.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.cs index 8d07c97d..c55eeb8a 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.cs @@ -125,10 +125,9 @@ namespace WebsitePanel.Portal } // FILE MANAGER - settings = ES.Services.System.GetSystemSettings( - WSP.SystemSettings.FILEMANAGER_SETTINGS); + settings = ES.Services.System.GetSystemSettings(WSP.SystemSettings.FILEMANAGER_SETTINGS); - if (settings != null) + if (settings != null && !String.IsNullOrEmpty(settings[FILE_MANAGER_EDITABLE_EXTENSIONS])) { txtFileManagerEditableExtensions.Text = settings[FILE_MANAGER_EDITABLE_EXTENSIONS].Replace(",", System.Environment.NewLine); } From 06f35d45c2843ccdef49e478e50f1a3af1bb9ca7 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Tue, 8 Oct 2013 12:16:30 -0400 Subject: [PATCH 5/8] Added tag build-2.1.0.181 for changeset 520ea078c678 From 83397d1eb14234213a47ed8d866a1faf4f403645 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Tue, 8 Oct 2013 17:49:03 -0400 Subject: [PATCH 6/8] Added tag build-2.1.0.182 for changeset a62488b97074 From 617e5ebd9269ceef60762550536686cda827443a Mon Sep 17 00:00:00 2001 From: Ruslan Keba Date: Thu, 10 Oct 2013 15:46:47 +0300 Subject: [PATCH 7/8] Fix 'Error on enabling zoo engines for site...' warning message --- .../WebServers/WebServerController.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs index 78bda188..c46671c9 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs @@ -3488,7 +3488,8 @@ namespace WebsitePanel.EnterpriseServer } catch(Exception e) { - TaskManager.WriteWarning("Error on enabling zoo engines for site '{0}': {1}", siteId, e.ToString()); + // TODO: write to right place debug warning message + // TaskManager.WriteWarning("Error on enabling zoo engines for site '{0}': {1}", siteId, e.ToString()); } } From b56981b1a6279dba818db1ea293dc892d5495117 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Thu, 10 Oct 2013 09:59:48 -0400 Subject: [PATCH 8/8] Added tag build-2.1.0.183 for changeset 2340d9417009