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

Get tests green

Browse Source
This commit is contained in:
Stephan
2017-09-22 15:23:46 +02:00
parent dca3b74542
commit c43bf6c741
38 changed files with 1139 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,7 +160,7 @@ namespace Umbraco.Core.Services
var parent = GetById(parentId);
return CreateContent(name, parent, contentTypeAlias, userId);
}
/// <summary>
/// Creates an <see cref="IContent"/> object of a specified content type.
/// </summary>
@@ -429,7 +429,7 @@ namespace Umbraco.Core.Services
{
uow.ReadLock(Constants.Locks.ContentTree);
var repository = uow.CreateRepository<IContentRepository>();
var items = repository.GetAll(idsA);
var items = repository.GetAll(idsA);
var index = items.ToDictionary(x => x.Key, x => x);
@@ -980,7 +980,7 @@ namespace Umbraco.Core.Services
true, false, ids);
var x = uow.Database.Fetch<int>(sql);
return ids.Length == x.Count;
}
}
}
public bool IsPathPublished(IContent content)
@@ -1091,7 +1091,7 @@ namespace Umbraco.Core.Services
using (var uow = UowProvider.CreateUnitOfWork())
{
var saveEventArgs = new SaveEventArgs<IContent>(contentsA, evtMsgs);
var saveEventArgs = new SaveEventArgs<IContent>(contentsA, evtMsgs);
if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
{
uow.Complete();
@@ -1606,7 +1606,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 Content performed by user", userId, content.Id);

12
src/Umbraco.Core/Services/UserService.cs
View File

@@ -364,7 +364,7 @@ namespace Umbraco.Core.Services
var entitiesA = entities.ToArray();
using (var uow = UowProvider.CreateUnitOfWork())
{
{
var saveEventArgs = new SaveEventArgs<IUser>(entitiesA);
if (raiseEvents && uow.Events.DispatchCancelable(SavingUser, this, saveEventArgs))
{
@@ -560,14 +560,14 @@ namespace Umbraco.Core.Services
if (filter.IsNullOrWhiteSpace() == false)
{
filterQuery = UowProvider.DatabaseContext.Query<IUser>().Where(x => x.Name.Contains(filter) || x.Username.Contains(filter));
}
}
return GetAll(pageIndex, pageSize, out totalRecords, orderBy, orderDirection, userState, userGroups, null, filterQuery);
}
public IEnumerable<IUser> GetAll(long pageIndex, int pageSize, out long totalRecords,
string orderBy, Direction orderDirection,
UserState[] userState = null, string[] includeUserGroups = null, string[] excludeUserGroups = null,
public IEnumerable<IUser> GetAll(long pageIndex, int pageSize, out long totalRecords,
string orderBy, Direction orderDirection,
UserState[] userState = null, string[] includeUserGroups = null, string[] excludeUserGroups = null,
IQuery<IUser> filter = null)
{
using (var uow = UowProvider.CreateUnitOfWork(readOnly: true))