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

Port 7.7 - WIP

Browse Source
This commit is contained in:
Stephan
2017-09-19 15:51:47 +02:00
parent d54658009c
commit 9ed6576908
126 changed files with 3447 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Services/LocalizationService.cs
View File

@@ -411,9 +411,9 @@ namespace Umbraco.Core.Services
public Dictionary<string, Guid> GetDictionaryItemKeyMap()
{
using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))
{
var repository = RepositoryFactory.CreateDictionaryRepository(uow);
var repository = uow.CreateRepository<IDictionaryRepository>();
return repository.GetDictionaryItemKeyMap();
}
}

10
src/Umbraco.Core/Services/MediaService.cs
View File

@@ -111,7 +111,7 @@ namespace Umbraco.Core.Services
var parent = GetById(parentId);
return CreateMedia(name, parent, mediaTypeAlias, userId);
}
/// <summary>
/// Creates an <see cref="IMedia"/> object of a specified media type.
/// </summary>
@@ -378,7 +378,7 @@ namespace Umbraco.Core.Services
return repository.GetAll(idsA);
}
}
/// <summary>
/// Gets a collection of <see cref="IMedia"/> objects by the Id of the <see cref="IMediaType"/>
/// </summary>
@@ -632,7 +632,7 @@ namespace Umbraco.Core.Services
var query = uow.Query<IMedia>();
//if the id is System Root, then just get all
if (id != Constants.System.Root)
{
{
var entityRepository = uow.CreateRepository<IEntityRepository>();
var mediaPath = entityRepository.GetAllPaths(Constants.ObjectTypes.MediaGuid, id).ToArray();
if (mediaPath.Length == 0)
@@ -797,7 +797,7 @@ namespace Umbraco.Core.Services
using (var uow = UowProvider.CreateUnitOfWork())
{
var saveEventArgs = new SaveEventArgs<IMedia>(media, evtMsgs);
var saveEventArgs = new SaveEventArgs<IMedia>(media, evtMsgs);
if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
{
uow.Complete();
@@ -1170,7 +1170,7 @@ namespace Umbraco.Core.Services
.ToArray();
moveEventArgs.MoveInfoCollection = moveInfo;
moveEventArgs.CanCancel = false;
moveEventArgs.CanCancel = false;
uow.Events.Dispatch(Moved, this, moveEventArgs);
Audit(uow, AuditType.Move, "Move Media performed by user", userId, media.Id);
uow.Complete();

30
src/Umbraco.Core/Services/PublicAccessService.cs
View File

@@ -132,17 +132,18 @@ namespace Umbraco.Core.Services
var saveEventArgs = new SaveEventArgs<PublicAccessEntry>(entry, evtMsgs);
if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
{
uow.Commit();
uow.Complete();
return OperationStatus.Attempt.Cancel(evtMsgs, entry);
}
repo.AddOrUpdate(entry);
uow.Complete();
saveEventArgs.CanCancel = false;
uow.Events.Dispatch(Saved, this, saveEventArgs);
}
saveEventArgs.CanCancel = false;
uow.Events.Dispatch(Saved, this, saveEventArgs);
return OperationStatus.Attempt.Succeed(evtMsgs, entry);
}
@@ -171,16 +172,17 @@ namespace Umbraco.Core.Services
var saveEventArgs = new SaveEventArgs<PublicAccessEntry>(entry, evtMsgs);
if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
{
uow.Commit();
uow.Complete();
return OperationStatus.Attempt.Cancel(evtMsgs);
}
repo.AddOrUpdate(entry);
uow.Complete();
saveEventArgs.CanCancel = false;
uow.Events.Dispatch(Saved, this, saveEventArgs);
}
saveEventArgs.CanCancel = false;
uow.Events.Dispatch(Saved, this, saveEventArgs);
return OperationStatus.Attempt.Succeed(evtMsgs);
}
@@ -197,17 +199,18 @@ namespace Umbraco.Core.Services
var saveEventArgs = new SaveEventArgs<PublicAccessEntry>(entry, evtMsgs);
if (uow.Events.DispatchCancelable(Saving, this, saveEventArgs))
{
uow.Commit();
uow.Complete();
return OperationStatus.Attempt.Cancel(evtMsgs);
}
var repo = uow.CreateRepository<IPublicAccessRepository>();
repo.AddOrUpdate(entry);
uow.Complete();
saveEventArgs.CanCancel = false;
uow.Events.Dispatch(Saved, this, saveEventArgs);
}
saveEventArgs.CanCancel = false;
uow.Events.Dispatch(Saved, this, saveEventArgs);
return OperationStatus.Attempt.Succeed(evtMsgs);
}
@@ -224,17 +227,18 @@ namespace Umbraco.Core.Services
var deleteEventArgs = new DeleteEventArgs<PublicAccessEntry>(entry, evtMsgs);
if (uow.Events.DispatchCancelable(Deleting, this, deleteEventArgs))
{
uow.Commit();
return OperationStatus.Cancelled(evtMsgs);
uow.Complete();
return OperationStatus.Attempt.Cancel(evtMsgs);
}
var repo = uow.CreateRepository<IPublicAccessRepository>();
repo.Delete(entry);
uow.Complete();
deleteEventArgs.CanCancel = false;
uow.Events.Dispatch(Deleted, this, deleteEventArgs);
}
deleteEventArgs.CanCancel = false;
uow.Events.Dispatch(Deleted, this, deleteEventArgs);
return OperationStatus.Attempt.Succeed(evtMsgs);
}