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

Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias

Browse Source 
Conflicts:
	src/Umbraco.Core/Models/Rdbms/PropertyDataReadOnlyDto.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
This commit is contained in:
Shannon
2013-09-11 13:07:22 +10:00
parent 105af392dc 4c5d6b5730
commit e75c050eff
187 changed files with 5903 additions and 1613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ using Umbraco.Core.Events;
using Umbraco.Core.IO;
using Umbraco.Core.Logging;
using Umbraco.Core.Models;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.Models.Rdbms;
using Umbraco.Core.Persistence;
using Umbraco.Core.Persistence.Caching;
@@ -57,6 +58,17 @@ namespace Umbraco.Core.Services
_repositoryFactory = repositoryFactory;
}
//TODO: There are various ways to expose permission setting on this service, we just need to list out the different ways we'll need to
// be able to acheive this for the core, for now this is here so I can run a unit test.
internal void AssignContentPermissions(IContent entity, char permission, IEnumerable<object> userIds)
{
var uow = _uowProvider.GetUnitOfWork();
using (var repository = _repositoryFactory.CreateContentRepository(uow))
{
repository.AssignEntityPermissions(entity, permission, userIds);
}
}
/// <summary>
/// Creates an <see cref="IContent"/> object using the alias of the <see cref="IContentType"/>
/// that this Content should based on.