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

Merge pull request #2760 from umbraco/temp8-variants

Browse Source 
Variants Refactoring [v8]
This commit is contained in:
Shannon Deminick
2018-07-10 13:05:13 +10:00
committed by GitHub
parent 02de09eaf7 7250b3d491
commit 7132ccdd99
89 changed files with 2250 additions and 2060 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -768,8 +768,6 @@ namespace Umbraco.Core.Services.Implement
if (string.IsNullOrWhiteSpace(media.Name))
throw new ArgumentException("Media has no name.", nameof(media));
var isNew = media.IsNewEntity();
scope.WriteLock(Constants.Locks.MediaTree);
if (media.HasIdentity == false)
media.CreatorId = userId;
@@ -780,7 +778,7 @@ namespace Umbraco.Core.Services.Implement
saveEventArgs.CanCancel = false;
scope.Events.Dispatch(Saved, this, saveEventArgs);
}
var changeType = isNew ? TreeChangeTypes.RefreshBranch : TreeChangeTypes.RefreshNode;
var changeType = TreeChangeTypes.RefreshNode;
scope.Events.Dispatch(TreeChanged, this, new TreeChange<IMedia>(media, changeType).ToEventArgs());
Audit(AuditType.Save, "Save Media performed by user", userId, media.Id);
@@ -810,7 +808,7 @@ namespace Umbraco.Core.Services.Implement
return OperationResult.Attempt.Cancel(evtMsgs);
}
var treeChanges = mediasA.Select(x => new TreeChange<IMedia>(x, x.IsNewEntity() ? TreeChangeTypes.RefreshBranch : TreeChangeTypes.RefreshNode));
var treeChanges = mediasA.Select(x => new TreeChange<IMedia>(x, TreeChangeTypes.RefreshNode));
scope.WriteLock(Constants.Locks.MediaTree);
foreach (var media in mediasA)