yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix exporting/importing macro partial views using a virtual file path

Browse Source
This commit is contained in:
Ronald Barendse
2021-09-21 11:22:40 +02:00
parent 8b853b17ac
commit a9d8f5fa5b
2 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Umbraco.Core/Packaging/PackagesRepository.cs
View File

@@ -414,9 +414,10 @@ namespace Umbraco.Cms.Core.Packaging
root.Add(macros);
// get the partial views for macros and package those
IEnumerable<string> views = packagedMacros.Select(x => x.MacroSource).Where(x => x.EndsWith(".cshtml"));
PackageMacroPartialViews(views, root);
// Get the partial views for macros and package those (exclude views outside of the default directory, e.g. App_Plugins\*\Views)
IEnumerable<string> views = packagedMacros.Where(x => x.MacroSource.StartsWith(Constants.SystemDirectories.MacroPartials))
.Select(x => x.MacroSource.Substring(Constants.SystemDirectories.MacroPartials.Length).Replace('/', '\\'));
PackageStaticFiles(views, root, "MacroPartialViews", "View", _fileSystems.MacroPartialsFileSystem);
}
private void PackageStylesheets(PackageDefinition definition, XContainer root)
@@ -487,33 +488,6 @@ namespace Umbraco.Cms.Core.Packaging
root.Add(templatesXml);
}
private void PackageMacroPartialViews(IEnumerable<string> viewPaths, XContainer root)
{
var viewsXml = new XElement("MacroPartialViews");
foreach (var viewPath in viewPaths)
{
// TODO: See TODO note in MacrosController about the inconsistencies of usages of partial views
// and how paths are saved. We have no choice currently but to assume that all views are 100% always
// on the content path.
var physicalPath = _hostingEnvironment.MapPathContentRoot(viewPath);
if (!File.Exists(physicalPath))
{
throw new InvalidOperationException("Could not find partial view at path " + viewPath);
}
var fileContents = File.ReadAllText(physicalPath, Encoding.UTF8);
viewsXml.Add(
new XElement(
"View",
new XAttribute("path", viewPath),
new XCData(fileContents)));
}
root.Add(viewsXml);
}
private void PackageDocumentTypes(PackageDefinition definition, XContainer root)
{
var contentTypes = new HashSet<IContentType>();

11
src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
View File

@@ -1270,6 +1270,17 @@ namespace Umbraco.Cms.Infrastructure.Packaging
throw new InvalidOperationException("No path attribute found");
}
// Remove prefix to maintain backwards compatibility
if (path.StartsWith(Constants.SystemDirectories.MacroPartials))
{
path = path.Substring(Constants.SystemDirectories.MacroPartials.Length);
}
else if (path.StartsWith("~"))
{
_logger.LogWarning("Importing macro partial views outside of the Views/MacroPartials directory is not supported: {Path}", path);
continue;
}
IPartialView macroPartialView = _fileService.GetPartialViewMacro(path);
// only update if it doesn't exist