From 8425c3124d9771d0b8b48b4acaaa9a132f592feb Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Wed, 5 Dec 2018 15:15:45 +0000 Subject: [PATCH] Modify FileSystemTree Controller - that if * is used for file extension then we will return all files :) --- src/Umbraco.Web/Trees/FileSystemTreeController.cs | 4 ++++ src/Umbraco.Web/Trees/FilesTreeController.cs | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web/Trees/FileSystemTreeController.cs b/src/Umbraco.Web/Trees/FileSystemTreeController.cs index 9babb656fe..bf301ebe60 100644 --- a/src/Umbraco.Web/Trees/FileSystemTreeController.cs +++ b/src/Umbraco.Web/Trees/FileSystemTreeController.cs @@ -57,6 +57,10 @@ namespace Umbraco.Web.Trees var files = FileSystem.GetFiles(path).Where(x => { var extension = Path.GetExtension(x); + + if (Extensions.Contains("*")) + return true; + return extension != null && Extensions.Contains(extension.Trim('.'), StringComparer.InvariantCultureIgnoreCase); }); diff --git a/src/Umbraco.Web/Trees/FilesTreeController.cs b/src/Umbraco.Web/Trees/FilesTreeController.cs index a435d3a668..947522747d 100644 --- a/src/Umbraco.Web/Trees/FilesTreeController.cs +++ b/src/Umbraco.Web/Trees/FilesTreeController.cs @@ -10,9 +10,11 @@ namespace Umbraco.Web.Trees { protected override IFileSystem FileSystem => new PhysicalFileSystem("~/"); // fixme inject - protected override string[] Extensions => new string[] { }; + private static readonly string[] ExtensionsStatic = { "*" }; - protected override string FileIcon => "icon-script"; + protected override string[] Extensions => ExtensionsStatic; + + protected override string FileIcon => "icon-document"; protected override void OnRenderFolderNode(ref TreeNode treeNode) {