From bf2efd30e91c843c47bf73e561aba2b9841d0bd2 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Mon, 24 Mar 2014 09:29:08 +0100 Subject: [PATCH] U4-4073 Audit Trail is missing from action menu Removed the icons for now as they are missing and should be new style icons anyway --- src/Umbraco.Web/Trees/ContentTreeController.cs | 1 + .../umbraco/dialogs/viewAuditTrail.aspx.cs | 9 ++------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs index 995fba0552..0c0a4e7a27 100644 --- a/src/Umbraco.Web/Trees/ContentTreeController.cs +++ b/src/Umbraco.Web/Trees/ContentTreeController.cs @@ -241,6 +241,7 @@ namespace Umbraco.Web.Trees menu.Items.Add(ui.Text("actions", ActionSort.Instance.Alias), true).ConvertLegacyMenuItem(item, "content", "content"); menu.Items.Add(ui.Text("actions", ActionRollback.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); + menu.Items.Add(ui.Text("actions", ActionAudit.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); menu.Items.Add(ui.Text("actions", ActionPublish.Instance.Alias), true).ConvertLegacyMenuItem(item, "content", "content"); menu.Items.Add(ui.Text("actions", ActionToPublish.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); menu.Items.Add(ui.Text("actions", ActionAssignDomain.Instance.Alias)).ConvertLegacyMenuItem(item, "content", "content"); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs index aa43f877d7..2a0c5517b4 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/viewAuditTrail.aspx.cs @@ -38,14 +38,9 @@ namespace umbraco.presentation.umbraco.dialogs if (action == "new") action = "create"; ArrayList actions = BusinessLogic.Actions.Action.GetAll(); - foreach (interfaces.IAction a in actions) + foreach (interfaces.IAction a in actions) { - if (string.Compare(a.Alias, action, true) == 0) { - if(a.Icon.StartsWith(".")) - return "
" + ui.Text(action) + "
"; - else - return "\"" " + ui.Text(action); - } + return ui.Text(action); } return action; }