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

Fix build after merge

Browse Source
This commit is contained in:
Bjarke Berg
2021-10-29 10:14:52 +02:00
parent 02bf61667d
commit bf5f1364fd
13 changed files with 1028 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web.BackOffice/Controllers/EntityController.cs
View File

@@ -204,7 +204,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
var allowedSections = _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.AllowedSections.ToArray();
foreach (KeyValuePair<string, SearchableApplicationTree> searchableTree in _searchableTreeCollection
.SearchableApplicationTrees.OrderBy(t => t.Value.SortOrder))
.SearchableApplicationTrees.OrderBy(t => t.Value.SortOrder))
{
if (allowedSections.Contains(searchableTree.Value.AppAlias))
{
@@ -1027,13 +1027,13 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
case UmbracoEntityTypes.Macro:
case UmbracoEntityTypes.Template:
var template = Services.FileService.GetTemplate(key);
ITemplate template = _fileService.GetTemplate(key);
if (template is null)
{
throw new HttpResponseException(HttpStatusCode.NotFound);
return NotFound();
}
return Mapper.Map<ITemplate, EntityBasic>(template);
return _umbracoMapper.Map<ITemplate, EntityBasic>(template);
default:
throw new NotSupportedException("The " + typeof(EntityController) +
@@ -1069,13 +1069,13 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
case UmbracoEntityTypes.Macro:
case UmbracoEntityTypes.Template:
var template = Services.FileService.GetTemplate(id);
ITemplate template = _fileService.GetTemplate(id);
if (template is null)
{
throw new HttpResponseException(HttpStatusCode.NotFound);
return NotFound();
}
return Mapper.Map<ITemplate, EntityBasic>(template);
return _umbracoMapper.Map<ITemplate, EntityBasic>(template);
default:
throw new NotSupportedException("The " + typeof(EntityController) +
@@ -1447,7 +1447,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
var list = new List<EntityBasic>();
foreach (IDictionaryItem dictionaryItem in _localizationService.GetRootDictionaryItems()
.OrderBy(DictionaryItemSort()))
.OrderBy(DictionaryItemSort()))
{
EntityBasic item = _umbracoMapper.Map<IDictionaryItem, EntityBasic>(dictionaryItem);
list.Add(item);
@@ -1462,7 +1462,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
private void GetChildItemsForList(IDictionaryItem dictionaryItem, ICollection<EntityBasic> list)
{
foreach (IDictionaryItem childItem in _localizationService.GetDictionaryItemChildren(dictionaryItem.Key)
.OrderBy(DictionaryItemSort()))
.OrderBy(DictionaryItemSort()))
{
EntityBasic item = _umbracoMapper.Map<IDictionaryItem, EntityBasic>(childItem);
list.Add(item);