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

U4-7048 - more filesystems cleanup

Browse Source
This commit is contained in:
Stephan
2015-09-09 16:32:45 +02:00
parent e8b2f3cd0b
commit 59ec709c69
3 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Trees/PartialViewMacrosTree.cs
View File

@@ -23,8 +23,6 @@ namespace Umbraco.Web.Trees
public override void RenderJS(ref StringBuilder javascript)
{
//NOTE: Notice the MacroPartials%2f string below, this is a URLEncoded string of "MacroPartials/" so that the editor knows
// to load the file from the correct location
javascript.Append(
@"
function openMacroPartialView(id) {

2
src/Umbraco.Web/Trees/PartialViewsTree.cs
View File

@@ -25,8 +25,6 @@ namespace Umbraco.Web.Trees
public override void RenderJS(ref StringBuilder javascript)
{
//NOTE: Notice the Partials%2f string below, this is a URLEncoded string of "Partials/" so that the editor knows
// to load the file from the correct location
javascript.Append(
@"
function openPartialView(id) {

13
src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasksBase.cs
View File

@@ -52,12 +52,7 @@ namespace umbraco
if (IsPartialViewMacro == false)
{
var attempt = fileService.CreatePartialView(model, snippetName, User.Id);
//TODO: We currently need to hack this because we are using the same editor for views, partial views, partial view macros and
// the editor is using normal UI whereas the partial view repo and these classes are using IFileSystem with relative references
// so the model.Path is a relative reference to the ~/Views/Partials folder, we need to ensure it's prefixed with "Partials/"
_returnUrl = string.Format("settings/views/EditView.aspx?treeType=partialViews&file={0}", model.Path.TrimStart('/').EnsureStartsWith("Partials/"));
_returnUrl = string.Format("settings/views/EditView.aspx?treeType=partialViews&file={0}", model.Path.TrimStart('/'));
return attempt.Success;
}
else
@@ -73,11 +68,7 @@ namespace umbraco
macroService.Save(new Macro(attempt.Result.Alias, attempt.Result.Alias) { ScriptPath = virtualPath });
}
//TODO: We currently need to hack this because we are using the same editor for views, partial views, partial view macros and
// the editor is using normal UI whereas the partial view repo and these classes are using IFileSystem with relative references
// so the model.Path is a relative reference to the ~/Views/Partials folder, we need to ensure it's prefixed with "MacroPartials/"
_returnUrl = string.Format("settings/views/EditView.aspx?treeType=partialViewMacros&file={0}", model.Path.TrimStart('/').EnsureStartsWith("MacroPartials/"));
_returnUrl = string.Format("settings/views/EditView.aspx?treeType=partialViewMacros&file={0}", model.Path.TrimStart('/'));
return attempt.Success;
}