From fd88e42daf55724259eb24bbb2851bb08d0f953a Mon Sep 17 00:00:00 2001 From: donker Date: Tue, 5 Nov 2019 18:44:19 +0100 Subject: [PATCH 1/2] Improve props popup --- DNN Platform/Modules/DigitalAssets/FileProperties.ascx.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/DNN Platform/Modules/DigitalAssets/FileProperties.ascx.cs b/DNN Platform/Modules/DigitalAssets/FileProperties.ascx.cs index efe68c8407f..d142ac2830d 100644 --- a/DNN Platform/Modules/DigitalAssets/FileProperties.ascx.cs +++ b/DNN Platform/Modules/DigitalAssets/FileProperties.ascx.cs @@ -74,7 +74,8 @@ protected string ActiveTab { get { - return Request.QueryString["activeTab"]; + var activeTab = Request.QueryString["activeTab"]; + return string.IsNullOrEmpty(activeTab) ? activeTab : System.Text.RegularExpressions.Regex.Replace(activeTab, "[^\\w]", ""); } } @@ -174,7 +175,7 @@ protected override void OnLoad(EventArgs e) Exceptions.ProcessModuleLoadException(this, exc); } } - + private void OnItemUpdated() { SetFilePreviewInfo(); @@ -231,7 +232,7 @@ private void SetPropertiesAvailability(bool availability) private void SetFilePreviewInfo() { var previewPanelInstance = (PreviewPanelControl)previewPanelControl; - previewPanelInstance.SetPreviewInfo(controller.GetFilePreviewInfo(file, fileItem)); + previewPanelInstance.SetPreviewInfo(controller.GetFilePreviewInfo(file, fileItem)); } private void PrepareFilePreviewInfoControl() From d30a5ca21e49ff9ae9ed03de6d89fc2972030ba2 Mon Sep 17 00:00:00 2001 From: donker Date: Tue, 5 Nov 2019 18:45:34 +0100 Subject: [PATCH 2/2] Better --- DNN Platform/Modules/DigitalAssets/FileProperties.ascx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DNN Platform/Modules/DigitalAssets/FileProperties.ascx.cs b/DNN Platform/Modules/DigitalAssets/FileProperties.ascx.cs index d142ac2830d..883c7929aed 100644 --- a/DNN Platform/Modules/DigitalAssets/FileProperties.ascx.cs +++ b/DNN Platform/Modules/DigitalAssets/FileProperties.ascx.cs @@ -75,7 +75,7 @@ protected string ActiveTab get { var activeTab = Request.QueryString["activeTab"]; - return string.IsNullOrEmpty(activeTab) ? activeTab : System.Text.RegularExpressions.Regex.Replace(activeTab, "[^\\w]", ""); + return string.IsNullOrEmpty(activeTab) ? "" : System.Text.RegularExpressions.Regex.Replace(activeTab, "[^\\w]", ""); } }