yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hackathon-remove-imediaserviceoperation' of https://github.com/AndyFelton/Umbraco-CMS into temp8-mediaserviceops

Browse Source
This commit is contained in:
Stephan
2018-07-09 11:49:56 +02:00
parent 2bae3e2eda c56b983cd6
commit f4983a2b21
7 changed files with 25 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Umbraco.Core/Services/Implement/MediaService.cs
View File

@@ -743,16 +743,6 @@ namespace Umbraco.Core.Services.Implement
#region Save
/// <summary>
/// Saves a single <see cref="IMedia"/> object
/// </summary>
/// <param name="media">The <see cref="IMedia"/> to save</param>
/// <param name="userId">Id of the User saving the Media</param>
/// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
public void Save(IMedia media, int userId = 0, bool raiseEvents = true)
{
((IMediaServiceOperations) this).Save(media, userId, raiseEvents);
}
/// <summary>
/// Saves a single <see cref="IMedia"/> object
@@ -859,21 +849,7 @@ namespace Umbraco.Core.Services.Implement
#endregion
#region Delete
/// <summary>
/// Permanently deletes an <see cref="IMedia"/> object as well as all of its Children.
/// </summary>
/// <remarks>
/// Please note that this method will completely remove the Media from the database,
/// as well as associated media files from the file system.
/// </remarks>
/// <param name="media">The <see cref="IMedia"/> to delete</param>
/// <param name="userId">Id of the User deleting the Media</param>
public void Delete(IMedia media, int userId = 0)
{
((IMediaServiceOperations) this).Delete(media, userId);
}
/// <summary>
/// Permanently deletes an <see cref="IMedia"/> object
/// </summary>
@@ -1029,16 +1005,6 @@ namespace Umbraco.Core.Services.Implement
#region Move, RecycleBin
/// <summary>
/// Deletes an <see cref="IMedia"/> object by moving it to the Recycle Bin
/// </summary>
/// <param name="media">The <see cref="IMedia"/> to delete</param>
/// <param name="userId">Id of the User deleting the Media</param>
public void MoveToRecycleBin(IMedia media, int userId = 0)
{
((IMediaServiceOperations) this).MoveToRecycleBin(media, userId);
}
/// <summary>
/// Deletes an <see cref="IMedia"/> object by moving it to the Recycle Bin
/// </summary>
@@ -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;
}