From d00bf4649dfbad8c1b4901d2cf172b60dee70ca3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 8 Jul 2015 11:10:18 +0200
Subject: [PATCH] Fix for JsSource on legacy trees not supporting virtual paths
 (~/) - U4-6346

Conflicts:
	src/umbraco.cms/Actions/Action.cs
---
 .../RelationTypes/TreeMenu/ActionDeleteRelationType.cs         | 2 +-
 .../developer/RelationTypes/TreeMenu/ActionNewRelationType.cs  | 2 +-
 src/umbraco.cms/Actions/Action.cs                              | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.cs
index c9d7a21dfb..436ead7c93 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionDeleteRelationType.cs
@@ -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>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.cs
index 2dcbbfb077..4b36559da2 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/TreeMenu/ActionNewRelationType.cs
@@ -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>
diff --git a/src/umbraco.cms/Actions/Action.cs b/src/umbraco.cms/Actions/Action.cs
index 075cd84436..724ae421da 100644
--- a/src/umbraco.cms/Actions/Action.cs
+++ b/src/umbraco.cms/Actions/Action.cs
@@ -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;
         }