From c91776dd5ed5f91ea9e5bd7a703e85f7b5840bfd Mon Sep 17 00:00:00 2001
From: Warren <warren@umbraco.com>
Date: Thu, 2 Aug 2018 10:27:37 +0100
Subject: [PATCH] Sets the Assign Domain Content tree menu item to not use the
 legacy conversion - will load a view from
 /umbraco/views/content/assignDomain.html based on convention routing

---
 src/Umbraco.Web/Trees/ContentTreeController.cs        | 2 +-
 src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs      | 5 -----
 src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
index 64787b8954..d416a2ee0f 100644
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -232,7 +232,7 @@ namespace Umbraco.Web.Trees
 
             AddActionNode<ActionRollback>(item, menu, convert: true);
             AddActionNode<ActionToPublish>(item, menu, convert: true);
-            AddActionNode<ActionAssignDomain>(item, menu, convert: true);
+            AddActionNode<ActionAssignDomain>(item, menu);
             AddActionNode<ActionRights>(item, menu, convert: true);
             AddActionNode<ActionProtect>(item, menu, true, true);
 
diff --git a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
index b8b59013e1..410c74c0dc 100644
--- a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
+++ b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
@@ -257,11 +257,6 @@ namespace Umbraco.Web.Trees
                         new LegacyUrlAction(
                             "dialogs/republish.aspx?rnd=" + DateTime.UtcNow.Ticks,
                             Current.Services.TextService.Localize("actions/republish")));
-                case "UmbClientMgr.appActions().actionAssignDomain()":
-                    return Attempt.Succeed(
-                        new LegacyUrlAction(
-                            "dialogs/assignDomain2.aspx?id=" + nodeId + "&rnd=" + DateTime.UtcNow.Ticks,
-                            Current.Services.TextService.Localize("actions/assignDomain")));
                 case "UmbClientMgr.appActions().actionSendToTranslate()":
                     return Attempt.Succeed(
                         new LegacyUrlAction(
diff --git a/src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs b/src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs
index e2542f9084..37de1f8e0f 100644
--- a/src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs
+++ b/src/Umbraco.Web/_Legacy/Actions/ActionAssignDomain.cs
@@ -27,7 +27,7 @@ namespace Umbraco.Web._Legacy.Actions
         {
             get
             {
-                return string.Format("{0}.actionAssignDomain()", ClientTools.Scripts.GetAppActions);
+                return null;
             }
         }