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

Fixes merge conflicts (needs updated ng-if in insert overlay)

Browse Source
This commit is contained in:
Niels Hartvig
2017-01-13 13:22:43 +01:00
parent 23304aca0b 5041a459d4
commit e7f7631d1e
198 changed files with 1691 additions and 1150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web/Models/ContentEditing/UmbracoEntityTypes.cs
View File

@@ -1,4 +1,7 @@
namespace Umbraco.Web.Models.ContentEditing
using System;
using System.ComponentModel;
namespace Umbraco.Web.Models.ContentEditing
{
/// <summary>
/// Represents the type's of Umbraco entities that can be resolved from the EntityController
@@ -53,6 +56,8 @@
/// <summary>
/// Content Item
/// </summary>
[Obsolete("This is not used and will be removed in future versions")]
[EditorBrowsable(EditorBrowsableState.Never)]
ContentItem,
/// <summary>

6
src/Umbraco.Web/Models/ContentExtensions.cs
View File

@@ -46,9 +46,7 @@ namespace Umbraco.Web.Models
{
var route = umbracoContext == null
? null // for tests only
: umbracoContext.ContentCache.GetRouteById(contentId); // cached
if (route != null && route.StartsWith("err/")) route = null;
: umbracoContext.ContentCache.GetRouteById(contentId); // may be cached
var domainHelper = new DomainHelper(domainService);
IDomain domain;
@@ -73,7 +71,7 @@ namespace Umbraco.Web.Models
}
else
{
// if content is published then we have a (cached) route
// if content is published then we have a route
// from which we can figure out the domain
var pos = route.IndexOf('/');

2
src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
View File

@@ -115,7 +115,7 @@ namespace Umbraco.Web.Models.Mapping
//map the tree node url
if (HttpContext.Current != null)
{
var urlHelper = new UrlHelper(new RequestContext(new HttpContextWrapper(HttpContext.Current), new RouteData()));
var urlHelper = new UrlHelper(HttpContext.Current.Request.RequestContext);
var url = urlHelper.GetUmbracoApiService<ContentTreeController>(controller => controller.GetTreeNode(display.Id.ToString(), null));
display.TreeNodeUrl = url;
}

2
src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs
View File

@@ -96,7 +96,7 @@ namespace Umbraco.Web.Models.Mapping
//map the tree node url
if (HttpContext.Current != null)
{
var urlHelper = new UrlHelper(new RequestContext(new HttpContextWrapper(HttpContext.Current), new RouteData()));
var urlHelper = new UrlHelper(HttpContext.Current.Request.RequestContext);
var url = urlHelper.GetUmbracoApiService<MediaTreeController>(controller => controller.GetTreeNode(display.Id.ToString(), null));
display.TreeNodeUrl = url;
}

2
src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
View File

@@ -148,7 +148,7 @@ namespace Umbraco.Web.Models.Mapping
//map the tree node url
if (HttpContext.Current != null)
{
var urlHelper = new UrlHelper(new RequestContext(new HttpContextWrapper(HttpContext.Current), new RouteData()));
var urlHelper = new UrlHelper(HttpContext.Current.Request.RequestContext);
var url = urlHelper.GetUmbracoApiService<MemberTreeController>(controller => controller.GetTreeNode(display.Key.ToString("N"), null));
display.TreeNodeUrl = url;
}

3
src/Umbraco.Web/Models/Mapping/TemplateModelMapper.cs
View File

@@ -10,7 +10,8 @@ namespace Umbraco.Web.Models.Mapping
{
public override void ConfigureMappings(IConfiguration config, ApplicationContext applicationContext)
{
config.CreateMap<ITemplate, TemplateDisplay>();
config.CreateMap<ITemplate, TemplateDisplay>()
.ForMember(x => x.Notifications, exp => exp.Ignore());
config.CreateMap<TemplateDisplay, Template>()
.ForMember(x => x.Key, exp => exp.Ignore())