diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs index d639d3a0a8..3f63ef7516 100644 --- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs +++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs @@ -146,10 +146,11 @@ namespace Umbraco.Web.Editors "redirectUrlManagementApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl( controller => controller.GetEnableState()) }, - { - "tourApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl( - controller => controller.GetTours()) - }, + //TODO reintroduce + // { + // "tourApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl( + // controller => controller.GetTours()) + // }, { "embedApiBaseUrl", _urlHelper.GetUmbracoApiServiceBaseUrl( controller => controller.GetEmbed("", 0, 0)) diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs index c1ddb6dba8..0bb9f93b83 100644 --- a/src/Umbraco.Web/Editors/ContentController.cs +++ b/src/Umbraco.Web/Editors/ContentController.cs @@ -303,7 +303,7 @@ namespace Umbraco.Web.Editors /// /// /// - [OutgoingEditorModelEvent] + // [OutgoingEditorModelEvent] // TODO introduce when moved to .NET Core [EnsureUserPermissionForContent("id")] public ContentItemDisplay GetById(int id) { @@ -322,7 +322,7 @@ namespace Umbraco.Web.Editors /// /// /// - [OutgoingEditorModelEvent] + // [OutgoingEditorModelEvent] // TODO introduce when moved to .NET Core [EnsureUserPermissionForContent("id")] public ContentItemDisplay GetById(Guid id) { @@ -342,7 +342,7 @@ namespace Umbraco.Web.Editors /// /// /// - [OutgoingEditorModelEvent] + // [OutgoingEditorModelEvent] // TODO introduce when moved to .NET Core [EnsureUserPermissionForContent("id")] public ContentItemDisplay GetById(Udi id) { @@ -360,7 +360,7 @@ namespace Umbraco.Web.Editors /// /// /// - [OutgoingEditorModelEvent] + // [OutgoingEditorModelEvent] // TODO introduce when moved to .NET Core public ContentItemDisplay GetEmpty(string contentTypeAlias, int parentId) { var contentType = Services.ContentTypeService.Get(contentTypeAlias); @@ -383,7 +383,7 @@ namespace Umbraco.Web.Editors return mapped; } - [OutgoingEditorModelEvent] + // [OutgoingEditorModelEvent] // TODO introduce when moved to .NET Core public ContentItemDisplay GetEmpty(int blueprintId, int parentId) { var blueprint = Services.ContentService.GetBlueprintById(blueprintId); @@ -608,7 +608,7 @@ namespace Umbraco.Web.Editors /// [FileUploadCleanupFilter] [ContentSaveValidation] - [OutgoingEditorModelEvent] + // [OutgoingEditorModelEvent] // TODO introduce when moved to .NET Core public ContentItemDisplay PostSave([ModelBinder(typeof(ContentItemBinder))] ContentItemSave contentItem) { var contentItemDisplay = PostSaveInternal( @@ -1629,7 +1629,7 @@ namespace Umbraco.Web.Editors /// The content and variants to unpublish /// [EnsureUserPermissionForContent("model.Id", 'Z')] - [OutgoingEditorModelEvent] + // [OutgoingEditorModelEvent] // TODO introduce when moved to .NET Core public ContentItemDisplay PostUnpublish(UnpublishContent model) { var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(model.Id)); diff --git a/src/Umbraco.Web/Editors/EditorModelEventManager.cs b/src/Umbraco.Web/Editors/EditorModelEventManager.cs deleted file mode 100644 index df4c5e4b36..0000000000 --- a/src/Umbraco.Web/Editors/EditorModelEventManager.cs +++ /dev/null @@ -1,74 +0,0 @@ -using System.Collections.Generic; -using System.Web.Http.Filters; -using Umbraco.Core.Dashboards; -using Umbraco.Core.Events; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.Editors -{ - /// - /// Used to emit events for editor models in the back office - /// - public sealed class EditorModelEventManager - { - public static event TypedEventHandler> SendingContentModel; - public static event TypedEventHandler> SendingMediaModel; - public static event TypedEventHandler> SendingMemberModel; - public static event TypedEventHandler> SendingUserModel; - - public static event TypedEventHandler>>> SendingDashboardSlimModel; - - private static void OnSendingDashboardModel(HttpActionExecutedContext sender, EditorModelEventArgs>> e) - { - var handler = SendingDashboardSlimModel; - handler?.Invoke(sender, e); - } - - private static void OnSendingUserModel(HttpActionExecutedContext sender, EditorModelEventArgs e) - { - var handler = SendingUserModel; - handler?.Invoke(sender, e); - } - - private static void OnSendingContentModel(HttpActionExecutedContext sender, EditorModelEventArgs e) - { - var handler = SendingContentModel; - handler?.Invoke(sender, e); - } - - private static void OnSendingMediaModel(HttpActionExecutedContext sender, EditorModelEventArgs e) - { - var handler = SendingMediaModel; - handler?.Invoke(sender, e); - } - - private static void OnSendingMemberModel(HttpActionExecutedContext sender, EditorModelEventArgs e) - { - var handler = SendingMemberModel; - handler?.Invoke(sender, e); - } - - /// - /// Based on the type, emit's a specific event - /// - /// - /// - internal static void EmitEvent(HttpActionExecutedContext sender, EditorModelEventArgs e) - { - if (e.Model is ContentItemDisplay) - OnSendingContentModel(sender, new EditorModelEventArgs(e)); - - if (e.Model is MediaItemDisplay) - OnSendingMediaModel(sender, new EditorModelEventArgs(e)); - - if (e.Model is MemberDisplay) - OnSendingMemberModel(sender, new EditorModelEventArgs(e)); - - if (e.Model is UserDisplay) - OnSendingUserModel(sender, new EditorModelEventArgs(e)); - - if (e.Model is IEnumerable>) - OnSendingDashboardModel(sender, new EditorModelEventArgs>>(e)); - } - } -} diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs index 40f00d54e5..73db8bdef4 100644 --- a/src/Umbraco.Web/Editors/MediaController.cs +++ b/src/Umbraco.Web/Editors/MediaController.cs @@ -96,7 +96,7 @@ namespace Umbraco.Web.Editors /// /// /// - [OutgoingEditorModelEvent] + // [OutgoingEditorModelEvent] // TODO introduce when moved to .NET Core public MediaItemDisplay GetEmpty(string contentTypeAlias, int parentId) { var contentType = Services.MediaTypeService.Get(contentTypeAlias); @@ -144,7 +144,7 @@ namespace Umbraco.Web.Editors /// /// /// - [OutgoingEditorModelEvent] + // [OutgoingEditorModelEvent] // TODO introduce when moved to .NET Core [EnsureUserPermissionForMedia("id")] public MediaItemDisplay GetById(int id) { @@ -164,7 +164,7 @@ namespace Umbraco.Web.Editors /// /// /// - [OutgoingEditorModelEvent] + // [OutgoingEditorModelEvent] // TODO introduce when moved to .NET Core [EnsureUserPermissionForMedia("id")] public MediaItemDisplay GetById(Guid id) { @@ -184,7 +184,7 @@ namespace Umbraco.Web.Editors /// /// /// - [OutgoingEditorModelEvent] + // [OutgoingEditorModelEvent] // TODO introduce when moved to .NET Core [EnsureUserPermissionForMedia("id")] public MediaItemDisplay GetById(Udi id) { @@ -475,7 +475,7 @@ namespace Umbraco.Web.Editors /// [FileUploadCleanupFilter] [MediaItemSaveValidation] - [OutgoingEditorModelEvent] + // [OutgoingEditorModelEvent] // TODO introduce when moved to .NET Core public MediaItemDisplay PostSave( [ModelBinder(typeof(MediaItemBinder))] MediaItemSave contentItem) diff --git a/src/Umbraco.Web/Editors/MemberController.cs b/src/Umbraco.Web/Editors/MemberController.cs index 55a3e29c5c..30d34d4bd6 100644 --- a/src/Umbraco.Web/Editors/MemberController.cs +++ b/src/Umbraco.Web/Editors/MemberController.cs @@ -135,7 +135,7 @@ namespace Umbraco.Web.Editors /// /// /// - [OutgoingEditorModelEvent] + // [OutgoingEditorModelEvent] // TODO introduce when moved to .NET Core public MemberDisplay GetByKey(Guid key) { var foundMember = Services.MemberService.GetByKey(key); @@ -151,7 +151,7 @@ namespace Umbraco.Web.Editors /// /// /// - [OutgoingEditorModelEvent] + // [OutgoingEditorModelEvent] // TODO introduce when moved to .NET Core public MemberDisplay GetEmpty(string contentTypeAlias = null) { IMember emptyContent; @@ -178,7 +178,7 @@ namespace Umbraco.Web.Editors /// /// [FileUploadCleanupFilter] - [OutgoingEditorModelEvent] + // [OutgoingEditorModelEvent] // TODO introduce when moved to .NET Core [MemberSaveValidation] public async Task PostSave( [ModelBinder(typeof(MemberBinder))] diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs index e695139b8c..5984a86b15 100644 --- a/src/Umbraco.Web/Editors/UsersController.cs +++ b/src/Umbraco.Web/Editors/UsersController.cs @@ -199,7 +199,7 @@ namespace Umbraco.Web.Editors /// /// /// - [OutgoingEditorModelEvent] + // [OutgoingEditorModelEvent] // TODO introduce when moved to .NET Core [AdminUsersAuthorize] public UserDisplay GetById(int id) { @@ -521,7 +521,7 @@ namespace Umbraco.Web.Editors /// /// /// - [OutgoingEditorModelEvent] + // [OutgoingEditorModelEvent] // TODO introduce when moved to .NET Core public async Task PostSaveUser(UserSave userSave) { if (userSave == null) throw new ArgumentNullException("userSave"); diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 048b9f21bd..4072bc9a2c 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -155,7 +155,6 @@ - @@ -399,7 +398,6 @@ - diff --git a/src/Umbraco.Web/WebApi/Filters/OutgoingEditorModelEventAttribute.cs b/src/Umbraco.Web/WebApi/Filters/OutgoingEditorModelEventAttribute.cs deleted file mode 100644 index e2a6f155d0..0000000000 --- a/src/Umbraco.Web/WebApi/Filters/OutgoingEditorModelEventAttribute.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Net.Http; -using System.Web.Http.Filters; -using Umbraco.Core; -using Umbraco.Web.Composing; -using Umbraco.Web.Editors; -using Umbraco.Web.Models.ContentEditing; - -namespace Umbraco.Web.WebApi.Filters -{ - /// - /// Used to emit outgoing editor model events - /// - internal sealed class OutgoingEditorModelEventAttribute : ActionFilterAttribute - { - public override void OnActionExecuted(HttpActionExecutedContext actionExecutedContext) - { - if (actionExecutedContext.Response == null) return; - - var user = Current.UmbracoContext.Security.CurrentUser; - if (user == null) return; - - if (actionExecutedContext.Response.Content is ObjectContent objectContent) - { - var model = objectContent.Value; - - if (model != null) - { - var args = new EditorModelEventArgs( - model, - Current.UmbracoContext); - EditorModelEventManager.EmitEvent(actionExecutedContext, args); - objectContent.Value = args.Model; - } - } - - base.OnActionExecuted(actionExecutedContext); - } - } -}