From c56b983cd6cbe1dd15cf699f5e569241d1172b3b Mon Sep 17 00:00:00 2001 From: Andy Felton Date: Fri, 29 Jun 2018 14:18:11 +0100 Subject: [PATCH] Merged methods from IMediaService to IMediaServiceOperations Moved methods from IMediaServer to IMediaServiceOperations, fixed tests and other code which depends on these. --- src/Umbraco.Core/Services/IMediaService.cs | 38 +--------------- .../Services/Implement/MediaService.cs | 38 +--------------- src/Umbraco.Tests/Models/MediaXmlTest.cs | 2 +- .../Repositories/MediaRepositoryTest.cs | 9 ++-- .../PublishedContent/PublishedMediaTests.cs | 5 ++- .../Services/ContentTypeServiceTests.cs | 4 +- .../Services/EntityServiceTests.cs | 45 ++++++++++--------- .../Services/MediaServiceTests.cs | 33 +++++++------- .../Services/ThreadSafetyServiceTest.cs | 2 +- src/Umbraco.Web/Editors/MediaController.cs | 6 +-- .../webservices/legacyAjaxCalls.asmx.cs | 5 ++- 11 files changed, 62 insertions(+), 125 deletions(-) diff --git a/src/Umbraco.Core/Services/IMediaService.cs b/src/Umbraco.Core/Services/IMediaService.cs index 3fd4199490..8e7d4b3f22 100644 --- a/src/Umbraco.Core/Services/IMediaService.cs +++ b/src/Umbraco.Core/Services/IMediaService.cs @@ -237,14 +237,7 @@ namespace Umbraco.Core.Services /// Id of the Media's new Parent /// Id of the User moving the Media void Move(IMedia media, int parentId, int userId = 0); - - /// - /// Deletes an object by moving it to the Recycle Bin - /// - /// The to delete - /// Id of the User deleting the Media - void MoveToRecycleBin(IMedia media, int userId = 0); - + /// /// Empties the Recycle Bin by deleting all that resides in the bin /// @@ -265,34 +258,7 @@ namespace Umbraco.Core.Services /// Ids of the s /// Optional Id of the user issueing the delete operation void DeleteMediaOfTypes(IEnumerable mediaTypeIds, int userId = 0); - - /// - /// Permanently deletes an object - /// - /// - /// Please note that this method will completely remove the Media from the database, - /// but current not from the file system. - /// - /// The to delete - /// Id of the User deleting the Media - void Delete(IMedia media, int userId = 0); - - /// - /// Saves a single object - /// - /// The to save - /// Id of the User saving the Media - /// Optional boolean indicating whether or not to raise events. - void Save(IMedia media, int userId = 0, bool raiseEvents = true); - - /// - /// Saves a collection of objects - /// - /// Collection of to save - /// Id of the User saving the Media - /// Optional boolean indicating whether or not to raise events. - void Save(IEnumerable medias, int userId = 0, bool raiseEvents = true); - + /// /// Gets an object by its 'UniqueId' /// diff --git a/src/Umbraco.Core/Services/Implement/MediaService.cs b/src/Umbraco.Core/Services/Implement/MediaService.cs index 504750874c..f1c70b92ad 100644 --- a/src/Umbraco.Core/Services/Implement/MediaService.cs +++ b/src/Umbraco.Core/Services/Implement/MediaService.cs @@ -743,16 +743,6 @@ namespace Umbraco.Core.Services.Implement #region Save - /// - /// Saves a single object - /// - /// The to save - /// Id of the User saving the Media - /// Optional boolean indicating whether or not to raise events. - public void Save(IMedia media, int userId = 0, bool raiseEvents = true) - { - ((IMediaServiceOperations) this).Save(media, userId, raiseEvents); - } /// /// Saves a single object @@ -859,21 +849,7 @@ namespace Umbraco.Core.Services.Implement #endregion #region Delete - - /// - /// Permanently deletes an object as well as all of its Children. - /// - /// - /// Please note that this method will completely remove the Media from the database, - /// as well as associated media files from the file system. - /// - /// The to delete - /// Id of the User deleting the Media - public void Delete(IMedia media, int userId = 0) - { - ((IMediaServiceOperations) this).Delete(media, userId); - } - + /// /// Permanently deletes an object /// @@ -1029,16 +1005,6 @@ namespace Umbraco.Core.Services.Implement #region Move, RecycleBin - /// - /// Deletes an object by moving it to the Recycle Bin - /// - /// The to delete - /// Id of the User deleting the Media - public void MoveToRecycleBin(IMedia media, int userId = 0) - { - ((IMediaServiceOperations) this).MoveToRecycleBin(media, userId); - } - /// /// Deletes an object by moving it to the Recycle Bin /// @@ -1090,7 +1056,7 @@ namespace Umbraco.Core.Services.Implement // if moving to the recycle bin then use the proper method if (parentId == Constants.System.RecycleBinMedia) { - MoveToRecycleBin(media, userId); + ((IMediaServiceOperations)this).MoveToRecycleBin(media, userId); return; } diff --git a/src/Umbraco.Tests/Models/MediaXmlTest.cs b/src/Umbraco.Tests/Models/MediaXmlTest.cs index 6f28842f18..20068d8ccd 100644 --- a/src/Umbraco.Tests/Models/MediaXmlTest.cs +++ b/src/Umbraco.Tests/Models/MediaXmlTest.cs @@ -33,7 +33,7 @@ namespace Umbraco.Tests.Models var media = MockedMedia.CreateMediaImage(mediaType, -1); media.WriterId = -1; // else it's zero and that's not a user and it breaks the tests - ServiceContext.MediaService.Save(media, Constants.Security.SuperUserId); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(media, Constants.Security.SuperUserId); // so we have to force-reset these values because the property editor has cleared them media.SetValue(Constants.Conventions.Media.Width, "200"); diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs index 53985b7897..4ec4cc403e 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs @@ -15,7 +15,8 @@ using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; using Umbraco.Tests.Testing; - +using Umbraco.Core.Services; + namespace Umbraco.Tests.Persistence.Repositories { [TestFixture] @@ -573,17 +574,17 @@ namespace Umbraco.Tests.Persistence.Repositories //Create and Save folder-Media -> (NodeDto.NodeIdSeed) var folderMediaType = ServiceContext.MediaTypeService.Get(1031); var folder = MockedMedia.CreateMediaFolder(folderMediaType, -1); - ServiceContext.MediaService.Save(folder, 0); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(folder, 0); //Create and Save image-Media -> (NodeDto.NodeIdSeed + 1) var imageMediaType = ServiceContext.MediaTypeService.Get(1032); var image = MockedMedia.CreateMediaImage(imageMediaType, folder.Id); - ServiceContext.MediaService.Save(image, 0); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(image, 0); //Create and Save file-Media -> (NodeDto.NodeIdSeed + 2) var fileMediaType = ServiceContext.MediaTypeService.Get(1033); var file = MockedMedia.CreateMediaFile(fileMediaType, folder.Id); - ServiceContext.MediaService.Save(file, 0); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(file, 0); } } } diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs index 9fcc6125bc..d7471f2dac 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs @@ -22,7 +22,8 @@ using Current = Umbraco.Web.Composing.Current; using Umbraco.Tests.Testing; using LightInject; using Umbraco.Core.Models.Membership; - +using Umbraco.Core.Services; + namespace Umbraco.Tests.PublishedContent { /// @@ -91,7 +92,7 @@ namespace Umbraco.Tests.PublishedContent ServiceContext.MediaTypeService.Save(mType); var media = MockedMedia.CreateMediaImage(mType, -1); media.Properties["content"].SetValue("
This is some content
"); - ServiceContext.MediaService.Save(media); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(media); var publishedMedia = GetNode(media.Id); diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs index c9f8ba52ad..3b2d25f034 100644 --- a/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs +++ b/src/Umbraco.Tests/Services/ContentTypeServiceTests.cs @@ -44,7 +44,7 @@ namespace Umbraco.Tests.Services { var contentType = contentTypes[index]; var contentItem = MockedMedia.CreateSimpleMedia(contentType, "MyName_" + index + "_" + i, parentId); - ServiceContext.MediaService.Save(contentItem); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(contentItem); parentId = contentItem.Id; ids.Add(contentItem.Id); @@ -133,7 +133,7 @@ namespace Umbraco.Tests.Services { var contentType = contentTypes[index]; var contentItem = MockedMedia.CreateSimpleMedia(contentType, "MyName_" + index + "_" + i, parentId); - ServiceContext.MediaService.Save(contentItem); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(contentItem); parentId = contentItem.Id; ids.Add(contentItem.Id); diff --git a/src/Umbraco.Tests/Services/EntityServiceTests.cs b/src/Umbraco.Tests/Services/EntityServiceTests.cs index 0bfc1890d7..363252fd4f 100644 --- a/src/Umbraco.Tests/Services/EntityServiceTests.cs +++ b/src/Umbraco.Tests/Services/EntityServiceTests.cs @@ -6,6 +6,7 @@ using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.Entities; +using Umbraco.Core.Services; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Tests.Testing; @@ -220,11 +221,11 @@ namespace Umbraco.Tests.Services var imageMediaType = ServiceContext.MediaTypeService.Get(1032); var root = MockedMedia.CreateMediaFolder(folderType, -1); - ServiceContext.MediaService.Save(root); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(root); for (int i = 0; i < 10; i++) { var c1 = MockedMedia.CreateMediaImage(imageMediaType, root.Id); - ServiceContext.MediaService.Save(c1); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(c1); } var service = ServiceContext.EntityService; @@ -245,18 +246,18 @@ namespace Umbraco.Tests.Services var imageMediaType = ServiceContext.MediaTypeService.Get(1032); var root = MockedMedia.CreateMediaFolder(folderType, -1); - ServiceContext.MediaService.Save(root); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(root); var count = 0; for (int i = 0; i < 10; i++) { var c1 = MockedMedia.CreateMediaImage(imageMediaType, root.Id); - ServiceContext.MediaService.Save(c1); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(c1); count++; for (int j = 0; j < 5; j++) { var c2 = MockedMedia.CreateMediaImage(imageMediaType, c1.Id); - ServiceContext.MediaService.Save(c2); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(c2); count++; } } @@ -279,12 +280,12 @@ namespace Umbraco.Tests.Services var imageMediaType = ServiceContext.MediaTypeService.Get(1032); var root = MockedMedia.CreateMediaFolder(folderType, -1); - ServiceContext.MediaService.Save(root); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(root); var toDelete = new List(); for (int i = 0; i < 10; i++) { var c1 = MockedMedia.CreateMediaImage(imageMediaType, root.Id); - ServiceContext.MediaService.Save(c1); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(c1); if (i % 2 == 0) { @@ -294,13 +295,13 @@ namespace Umbraco.Tests.Services for (int j = 0; j < 5; j++) { var c2 = MockedMedia.CreateMediaImage(imageMediaType, c1.Id); - ServiceContext.MediaService.Save(c2); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(c2); } } foreach (var content in toDelete) { - ServiceContext.MediaService.MoveToRecycleBin(content); + ((IMediaServiceOperations)(ServiceContext.MediaService)).MoveToRecycleBin(content); } var service = ServiceContext.EntityService; @@ -324,12 +325,12 @@ namespace Umbraco.Tests.Services var imageMediaType = ServiceContext.MediaTypeService.Get(1032); var root = MockedMedia.CreateMediaFolder(folderType, -1); - ServiceContext.MediaService.Save(root); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(root); var toDelete = new List(); for (int i = 0; i < 10; i++) { var c1 = MockedMedia.CreateMediaImage(imageMediaType, root.Id); - ServiceContext.MediaService.Save(c1); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(c1); if (i % 2 == 0) { @@ -339,17 +340,17 @@ namespace Umbraco.Tests.Services for (int j = 0; j < 5; j++) { var c2 = MockedMedia.CreateMediaImage(imageMediaType, c1.Id); - ServiceContext.MediaService.Save(c2); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(c2); } } foreach (var content in toDelete) { - ServiceContext.MediaService.MoveToRecycleBin(content); + ((IMediaServiceOperations)(ServiceContext.MediaService)).MoveToRecycleBin(content); } var service = ServiceContext.EntityService; - + long total; //search at root to see if it returns recycled var entities = service.GetPagedDescendants(UmbracoObjectTypes.Media, 0, 1000, out total, includeTrashed: false) @@ -369,19 +370,19 @@ namespace Umbraco.Tests.Services var imageMediaType = ServiceContext.MediaTypeService.Get(1032); var root = MockedMedia.CreateMediaFolder(folderType, -1); - ServiceContext.MediaService.Save(root); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(root); for (int i = 0; i < 10; i++) { var c1 = MockedMedia.CreateMediaImage(imageMediaType, root.Id); c1.Name = "ssss" + Guid.NewGuid(); - ServiceContext.MediaService.Save(c1); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(c1); for (int j = 0; j < 5; j++) { var c2 = MockedMedia.CreateMediaImage(imageMediaType, c1.Id); c2.Name = "tttt" + Guid.NewGuid(); - ServiceContext.MediaService.Save(c2); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(c2); } } @@ -725,23 +726,23 @@ namespace Umbraco.Tests.Services //Create and Save folder-Media -> 1050 var folderMediaType = ServiceContext.MediaTypeService.Get(1031); var folder = MockedMedia.CreateMediaFolder(folderMediaType, -1); - ServiceContext.MediaService.Save(folder, 0); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(folder, 0); folderId = folder.Id; //Create and Save image-Media -> 1051 var imageMediaType = ServiceContext.MediaTypeService.Get(1032); var image = MockedMedia.CreateMediaImage(imageMediaType, folder.Id); - ServiceContext.MediaService.Save(image, 0); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(image, 0); //Create and Save file-Media -> 1052 var fileMediaType = ServiceContext.MediaTypeService.Get(1033); var file = MockedMedia.CreateMediaFile(fileMediaType, folder.Id); - ServiceContext.MediaService.Save(file, 0); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(file, 0); var subfolder = MockedMedia.CreateMediaFolder(folderMediaType, folder.Id); - ServiceContext.MediaService.Save(subfolder, 0); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(subfolder, 0); var subfolder2 = MockedMedia.CreateMediaFolder(folderMediaType, subfolder.Id); - ServiceContext.MediaService.Save(subfolder2, 0); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(subfolder2, 0); } } } diff --git a/src/Umbraco.Tests/Services/MediaServiceTests.cs b/src/Umbraco.Tests/Services/MediaServiceTests.cs index 814a4af4ab..1329438c7b 100644 --- a/src/Umbraco.Tests/Services/MediaServiceTests.cs +++ b/src/Umbraco.Tests/Services/MediaServiceTests.cs @@ -10,6 +10,7 @@ using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Repositories; +using Umbraco.Core.Services; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Tests.Testing; @@ -33,9 +34,9 @@ namespace Umbraco.Tests.Services for (int i = 0; i < 10; i++) { var m1 = MockedMedia.CreateMediaImage(mediaType1, -1); - mediaService.Save(m1); + ((IMediaServiceOperations)(mediaService)).Save(m1); var m2 = MockedMedia.CreateMediaImage(mediaType2, -1); - mediaService.Save(m2); + ((IMediaServiceOperations)(mediaService)).Save(m2); } long total; @@ -73,7 +74,7 @@ namespace Umbraco.Tests.Services var media = mediaService.GetById(mediaItems.Item1.Id); // Act - mediaService.MoveToRecycleBin(media); + ((IMediaServiceOperations)mediaService).MoveToRecycleBin(media); // Assert Assert.That(media.ParentId, Is.EqualTo(-21)); @@ -109,7 +110,7 @@ namespace Umbraco.Tests.Services var media = mediaService.CreateMedia(string.Empty, -1, "video"); // Act & Assert - Assert.Throws(() => mediaService.Save(media)); + Assert.Throws(() => ((IMediaServiceOperations)(mediaService)).Save(media)); } [Test] @@ -120,7 +121,7 @@ namespace Umbraco.Tests.Services ServiceContext.MediaTypeService.Save(mediaType); var media = mediaService.CreateMedia("Test", -1, "video"); - mediaService.Save(media); + ((IMediaServiceOperations)(mediaService)).Save(media); using (var scope = ScopeProvider.CreateScope()) { @@ -136,7 +137,7 @@ namespace Umbraco.Tests.Services ServiceContext.MediaTypeService.Save(mediaType); var media = MockedMedia.CreateMediaImage(mediaType, -1); - mediaService.Save(media); + ((IMediaServiceOperations)(mediaService)).Save(media); var mediaPath = "/media/test-image.png"; var resolvedMedia = mediaService.GetMediaByPath(mediaPath); @@ -153,7 +154,7 @@ namespace Umbraco.Tests.Services ServiceContext.MediaTypeService.Save(mediaType); var media = MockedMedia.CreateMediaImageWithCrop(mediaType, -1); - mediaService.Save(media); + ((IMediaServiceOperations)(mediaService)).Save(media); var mediaPath = "/media/test-image.png"; var resolvedMedia = mediaService.GetMediaByPath(mediaPath); @@ -170,7 +171,7 @@ namespace Umbraco.Tests.Services for (int i = 0; i < 10; i++) { var c1 = MockedMedia.CreateMediaImage(mediaType, -1); - ServiceContext.MediaService.Save(c1); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(c1); } var service = ServiceContext.MediaService; @@ -193,17 +194,17 @@ namespace Umbraco.Tests.Services for (int i = 0; i < 9; i++) { var m1 = MockedMedia.CreateMediaImage(mediaType, -1); - ServiceContext.MediaService.Save(m1); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(m1); } var mediaTypeForFolder = MockedContentTypes.CreateImageMediaType("Folder2"); ServiceContext.MediaTypeService.Save(mediaTypeForFolder); var mediaFolder = MockedMedia.CreateMediaFolder(mediaTypeForFolder, -1); - ServiceContext.MediaService.Save(mediaFolder); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(mediaFolder); for (int i = 0; i < 10; i++) { var m1 = MockedMedia.CreateMediaImage(mediaType, mediaFolder.Id); - ServiceContext.MediaService.Save(m1); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(m1); } var service = ServiceContext.MediaService; @@ -231,26 +232,26 @@ namespace Umbraco.Tests.Services //Create and Save folder-Media -> 1050 var folderMediaType = ServiceContext.MediaTypeService.Get(1031); var folder = MockedMedia.CreateMediaFolder(folderMediaType, -1); - ServiceContext.MediaService.Save(folder); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(folder); //Create and Save folder-Media -> 1051 var folder2 = MockedMedia.CreateMediaFolder(folderMediaType, -1); - ServiceContext.MediaService.Save(folder2); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(folder2); //Create and Save image-Media -> 1052 var imageMediaType = ServiceContext.MediaTypeService.Get(1032); var image = (Media)MockedMedia.CreateMediaImage(imageMediaType, 1050); - ServiceContext.MediaService.Save(image); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(image); //Create and Save folder-Media that is trashed -> 1053 var folderTrashed = (Media)MockedMedia.CreateMediaFolder(folderMediaType, -21); folderTrashed.Trashed = true; - ServiceContext.MediaService.Save(folderTrashed); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(folderTrashed); //Create and Save image-Media child of folderTrashed -> 1054 var imageTrashed = (Media)MockedMedia.CreateMediaImage(imageMediaType, folderTrashed.Id); imageTrashed.Trashed = true; - ServiceContext.MediaService.Save(imageTrashed); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(imageTrashed); return new Tuple(folder, folder2, image, folderTrashed, imageTrashed); diff --git a/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs b/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs index 984de8d182..49eb9c2e1a 100644 --- a/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs +++ b/src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs @@ -62,7 +62,7 @@ namespace Umbraco.Tests.Services using (var scope = ScopeProvider.CreateScope()) { scope.Database.Execute("SET LOCK_TIMEOUT 60000"); - service.Save(media); + ((IMediaServiceOperations)(service)).Save(media); scope.Complete(); } } diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs index 5458070260..5e74a1fde8 100644 --- a/src/Umbraco.Web/Editors/MediaController.cs +++ b/src/Umbraco.Web/Editors/MediaController.cs @@ -576,7 +576,7 @@ namespace Umbraco.Web.Editors var mediaService = Services.MediaService; var f = mediaService.CreateMedia(folder.Name, intParentId, Constants.Conventions.MediaTypes.Folder); - mediaService.Save(f, Security.CurrentUser.Id); + ((IMediaServiceOperations)(mediaService)).Save(f, Security.CurrentUser.Id); return ContextMapper.Map(f, UmbracoContext); } @@ -637,7 +637,7 @@ namespace Umbraco.Web.Editors { //if null, create a folder folderMediaItem = mediaService.CreateMedia(folderName, -1, Constants.Conventions.MediaTypes.Folder); - mediaService.Save(folderMediaItem); + ((IMediaServiceOperations)(mediaService)).Save(folderMediaItem); } } else @@ -657,7 +657,7 @@ namespace Umbraco.Web.Editors { //if null, create a folder folderMediaItem = mediaService.CreateMedia(folderName, mediaRoot, Constants.Conventions.MediaTypes.Folder); - mediaService.Save(folderMediaItem); + ((IMediaServiceOperations)(mediaService)).Save(folderMediaItem); } } //set the media root to the folder id so uploaded files will end there. diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs index 13b37b21e8..c5cfa262d7 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs @@ -9,7 +9,8 @@ using Umbraco.Web.WebServices; using Umbraco.Core.Models.Membership; using Umbraco.Web.Composing; using Umbraco.Web._Legacy.UI; - +using Umbraco.Core.Services; + namespace umbraco.presentation.webservices { /// @@ -84,7 +85,7 @@ namespace umbraco.presentation.webservices AuthorizeRequest(Constants.Applications.Media.ToString(), true); var media = Current.Services.MediaService.GetById(intNodeId); if (media != null) - Current.Services.MediaService.Delete(media); + ((IMediaServiceOperations)(Current.Services.MediaService)).Delete(media); break; case "content": case "contentRecycleBin":