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

Fix for JsSource on legacy trees not supporting virtual paths (~/) - U4-6346

Browse Source 
Conflicts:
	src/umbraco.cms/Actions/Action.cs
This commit is contained in:
Shannon
2015-07-08 11:10:18 +02:00
parent 04976f8063
commit d00bf4649d
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.cs
View File

@@ -67,7 +67,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes.TreeMenu
/// </summary>
public string JsSource
{
get { return "/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.js"; }
get { return "~/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.js"; }
}
/// <summary>

2
src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.cs
View File

@@ -67,7 +67,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes.TreeMenu
/// </summary>
public string JsSource
{
get { return "/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.js"; }
get { return "~/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.js"; }
}
/// <summary>

3
src/umbraco.cms/Actions/Action.cs
View File

@@ -13,6 +13,7 @@ using umbraco.cms.businesslogic.workflow;
using umbraco.interfaces;
using System.Text.RegularExpressions;
using System.Linq;
using Umbraco.Core.IO;
using TypeFinder = Umbraco.Core.TypeFinder;
namespace umbraco.BusinessLogic.Actions
@@ -88,7 +89,7 @@ namespace umbraco.BusinessLogic.Actions
{
return ActionsResolver.Current.Actions
.Where(x => !string.IsNullOrWhiteSpace(x.JsSource))
.Select(x => x.JsSource).ToList();
.Select(x => IOHelper.ResolveUrl(x.JsSource)).ToList();
//return ActionJsReference;
}