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

Fixes SectionService to properly return the user's allowed sections now that the IUserRepository is working nicely.

Browse Source
This commit is contained in:
Shannon
2013-07-04 15:33:24 +10:00
parent 7e345fda70
commit 371a0cc65a
3 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Umbraco.Core/Services/SectionService.cs
View File

@@ -16,24 +16,19 @@ namespace Umbraco.Core.Services
{
internal class SectionService
{
private readonly IDatabaseUnitOfWorkProvider _uowProvider;
private readonly RepositoryFactory _repositoryFactory;
private readonly EntityService _entityService;
private readonly IUserService _userService;
private readonly ApplicationTreeService _applicationTreeService;
private readonly CacheHelper _cache;
public SectionService(
IDatabaseUnitOfWorkProvider uowProvider,
RepositoryFactory repositoryFactory,
EntityService entityService,
IUserService userService,
ApplicationTreeService applicationTreeService,
CacheHelper cache)
{
if (applicationTreeService == null) throw new ArgumentNullException("applicationTreeService");
if (cache == null) throw new ArgumentNullException("cache");
_uowProvider = uowProvider;
_repositoryFactory = repositoryFactory;
_entityService = entityService;
_userService = userService;
_applicationTreeService = applicationTreeService;
_cache = cache;
}
@@ -129,27 +124,14 @@ namespace Umbraco.Core.Services
/// <returns></returns>
public IEnumerable<Section> GetAllowedSections(int userId)
{
var allApps = GetSections();
var apps = new List<Section>();
var user = _userService.GetUserById(userId);
if (user == null)
{
throw new InvalidOperationException("No user found with id " + userId);
}
//TODO: Sort this out
//using (var repository = _repositoryFactory.CreateUserSectionRepository(_uowProvider.GetUnitOfWork()))
//{
// return repository.Get(id);
//}
//using (IRecordsReader appIcons = SqlHelper.ExecuteReader("select app from umbracoUser2app where [user] = @userID", SqlHelper.CreateParameter("@userID", this.Id)))
//{
// while (appIcons.Read())
// {
// var app = allApps.SingleOrDefault(x => x.alias == appIcons.GetString("app"));
// if (app != null)
// apps.Add(app);
// }
//}
return apps;
return GetSections().Where(x => user.AllowedSections.Contains(x.Alias));
}
/// <summary>

2
src/Umbraco.Core/Services/ServiceContext.cs
View File

@@ -94,7 +94,7 @@ namespace Umbraco.Core.Services
_treeService = new Lazy<ApplicationTreeService>(() => new ApplicationTreeService(cache));
if (_sectionService == null)
_sectionService = new Lazy<SectionService>(() => new SectionService(provider, repositoryFactory.Value, _entityService.Value, _treeService.Value, cache));
_sectionService = new Lazy<SectionService>(() => new SectionService(_userService.Value, _treeService.Value, cache));
}
/// <summary>

3
src/Umbraco.Web/Editors/SectionController.cs
View File

@@ -16,7 +16,8 @@ namespace Umbraco.Web.Editors
{
public IEnumerable<Section> GetSections()
{
return Services.SectionService.GetSections().Select(Mapper.Map<Core.Models.Section, Section>);
return Services.SectionService.GetAllowedSections(UmbracoUser.Id)
.Select(Mapper.Map<Core.Models.Section, Section>);
}
}
}