From 2954b31435a56bab064602d3c164d270b69afd4f Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 19 Feb 2014 21:48:17 +0100 Subject: [PATCH] Enables change content type action for v7 as well (see issue 1468) --- src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx | 1 + src/Umbraco.Web/Trees/ContentTreeController.cs | 1 + src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs | 5 +++++ src/umbraco.cms/Actions/ActionChangeDocType.cs | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx index 71baf52182..144f676e37 100644 --- a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx +++ b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx @@ -15,6 +15,7 @@ #propertyMapping tbody tr td{border-bottom:1px solid #efefef} #propertyMapping td{padding: 4px; ;} + body.umbracoDialog { overflow: scroll; } diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs index 13d30deb1f..995fba0552 100644 --- a/src/Umbraco.Web/Trees/ContentTreeController.cs +++ b/src/Umbraco.Web/Trees/ContentTreeController.cs @@ -236,6 +236,7 @@ namespace Umbraco.Web.Trees //need to ensure some of these are converted to the legacy system - until we upgrade them all to be angularized. menu.Items.Add(ui.Text("actions", ActionMove.Instance.Alias), true); menu.Items.Add(ui.Text("actions", ActionCopy.Instance.Alias)); + menu.Items.Add(ui.Text("actions", ActionChangeDocType.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); menu.Items.Add(ui.Text("actions", ActionSort.Instance.Alias), true).ConvertLegacyMenuItem(item, "content", "content"); diff --git a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs index 4384ad4651..3ded77dada 100644 --- a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs +++ b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs @@ -240,6 +240,11 @@ namespace Umbraco.Web.Trees new LegacyUrlAction( "dialogs/publish.aspx?id=" + nodeId + "&rnd=" + DateTime.UtcNow.Ticks, ui.GetText("actions", "publish"))); + case "UmbClientMgr.appActions().actionChangeDocType()": + return Attempt.Succeed( + new LegacyUrlAction( + "dialogs/ChangeDocType.aspx?id=" + nodeId + "&rnd=" + DateTime.UtcNow.Ticks, + ui.GetText("actions", "changeDocType"))); case "UmbClientMgr.appActions().actionToPublish()": return Attempt.Succeed( new LegacyUrlAction( diff --git a/src/umbraco.cms/Actions/ActionChangeDocType.cs b/src/umbraco.cms/Actions/ActionChangeDocType.cs index 3016f2ef6d..aff2b45697 100644 --- a/src/umbraco.cms/Actions/ActionChangeDocType.cs +++ b/src/umbraco.cms/Actions/ActionChangeDocType.cs @@ -69,7 +69,7 @@ namespace umbraco.BusinessLogic.Actions get { - return ".sprChangeDocType"; + return "axis-rotation-2"; } }