From d497659f1f41c8f82db72e09566bab70135f9d8d Mon Sep 17 00:00:00 2001 From: Morten Christensen Date: Sun, 3 Mar 2013 11:19:15 -0100 Subject: [PATCH] Fixes U4-1814 for Document and Media by adding both legacy Before/After Move events --- src/umbraco.cms/businesslogic/media/Media.cs | 14 +++++++++++--- src/umbraco.cms/businesslogic/web/Document.cs | 14 +++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/umbraco.cms/businesslogic/media/Media.cs b/src/umbraco.cms/businesslogic/media/Media.cs index 17594788be..d8231bf7aa 100644 --- a/src/umbraco.cms/businesslogic/media/Media.cs +++ b/src/umbraco.cms/businesslogic/media/Media.cs @@ -230,9 +230,17 @@ namespace umbraco.cms.businesslogic.media /// public override void Move(int newParentId) { - var current = User.GetCurrent(); - int userId = current == null ? 0 : current.Id; - ApplicationContext.Current.Services.MediaService.Move(MediaItem, newParentId, userId); + MoveEventArgs e = new MoveEventArgs(); + base.FireBeforeMove(e); + + if (!e.Cancel) + { + var current = User.GetCurrent(); + int userId = current == null ? 0 : current.Id; + ApplicationContext.Current.Services.MediaService.Move(MediaItem, newParentId, userId); + } + + base.FireAfterMove(e); } /// diff --git a/src/umbraco.cms/businesslogic/web/Document.cs b/src/umbraco.cms/businesslogic/web/Document.cs index 463d03bcab..d3fa05d0cb 100644 --- a/src/umbraco.cms/businesslogic/web/Document.cs +++ b/src/umbraco.cms/businesslogic/web/Document.cs @@ -1010,9 +1010,17 @@ namespace umbraco.cms.businesslogic.web /// public override void Move(int newParentId) { - var current = User.GetCurrent(); - int userId = current == null ? 0 : current.Id; - ApplicationContext.Current.Services.ContentService.Move(Content, newParentId, userId); + MoveEventArgs e = new MoveEventArgs(); + base.FireBeforeMove(e); + + if (!e.Cancel) + { + var current = User.GetCurrent(); + int userId = current == null ? 0 : current.Id; + ApplicationContext.Current.Services.ContentService.Move(Content, newParentId, userId); + } + + base.FireAfterMove(e); } ///