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

merge

Browse Source
This commit is contained in:
Per Ploug
2015-06-05 12:20:45 +02:00
parent 87b9758337 e580bfef97
commit cf3dfe4992
22 changed files with 479 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs
View File

@@ -61,10 +61,89 @@ namespace Umbraco.Tests.Models.Mapping
{
//initialize our content type mapper
var mapper = new ContentTypeModelMapper(new Lazy<PropertyEditorResolver>(() => _propertyEditorResolver.Object));
mapper.ConfigureMappings(configuration, appContext);
mapper.ConfigureMappings(configuration, appContext);
var entityMapper = new EntityModelMapper();
entityMapper.ConfigureMappings(configuration, appContext);
});
}
[Test]
public void ContentTypeDisplay_To_PropertyType()
{
// setup the mocks to return the data we want to test against...
_dataTypeService.Setup(x => x.GetDataTypeDefinitionById(It.IsAny<int>()))
.Returns(Mock.Of<IDataTypeDefinition>(
definition =>
definition.Id == 555
&& definition.PropertyEditorAlias == "myPropertyType"
&& definition.DatabaseType == DataTypeDatabaseType.Nvarchar));
var display = new PropertyTypeDisplay()
{
Id = 1,
Alias = "test",
ContentTypeId = 4,
Description = "testing",
DataTypeId = 555,
Value = "testsdfasdf",
Inherited = false,
Editor = "blah",
SortOrder = 6,
ContentTypeName = "Hello",
Label = "asdfasdf",
GroupId = 8,
Validation = new PropertyTypeValidation()
{
Mandatory = true,
Pattern = "asdfasdfa"
}
};
var result = Mapper.Map<PropertyType>(display);
Assert.AreEqual(1, result.Id);
Assert.AreEqual("test", result.Alias);
Assert.AreEqual("testing", result.Description);
Assert.AreEqual("blah", result.PropertyEditorAlias);
Assert.AreEqual(6, result.SortOrder);
Assert.AreEqual("asdfasdf", result.Name);
Assert.AreEqual(8, result.PropertyGroupId.Value);
}
[Test]
public void ContentGroupDisplay_To_PropertyGroup()
{
var display = new PropertyGroupDisplay()
{
ContentTypeId = 2,
Id = 1,
Inherited = false,
Name = "test",
ParentGroupId = 4,
ParentTabContentTypeNames = new[]
{
"hello", "world"
},
SortOrder = 5,
ParentTabContentTypes = new[]
{
10, 11
}
};
var result = Mapper.Map<PropertyGroup>(display);
Assert.AreEqual(1, result.Id);
Assert.AreEqual("test", result.Name);
Assert.AreEqual(4, result.ParentId);
Assert.AreEqual(5, result.SortOrder);
}
[Test]
public void ContentTypeDisplay_To_IContentType()
{
@@ -97,10 +176,12 @@ namespace Umbraco.Tests.Models.Mapping
Assert.AreEqual(display.Path, result.Path);
Assert.AreEqual(display.Thumbnail, result.Thumbnail);
Assert.AreEqual(display.IsContainer, result.IsContainer);
Assert.AreEqual(display.AllowAsRoot, result.AllowedAsRoot);
//TODO: Now we need to assert all of the more complicated parts
Assert.AreEqual(1, result.PropertyGroups.Count);
Assert.AreEqual(1, result.PropertyGroups[0].PropertyTypes.Count);
Assert.AreEqual(display.AllowedTemplates.Count(), result.AllowedTemplates.Count());
}
[Test]
@@ -123,6 +204,17 @@ namespace Umbraco.Tests.Models.Mapping
.Returns(new[] { new TextboxPropertyEditor() });
var contentType = MockedContentTypes.CreateTextpageContentType();
//ensure everything has ids
contentType.Id = 1234;
var itemid = 8888;
foreach (var propertyGroup in contentType.CompositionPropertyGroups)
{
propertyGroup.Id = itemid++;
}
foreach (var propertyType in contentType.CompositionPropertyTypes)
{
propertyType.Id = itemid++;
}
//Act
@@ -152,7 +244,8 @@ namespace Umbraco.Tests.Models.Mapping
{
return new ContentTypeDisplay
{
Alias = "test",
Alias = "test",
AllowAsRoot = true,
AllowedTemplates = new List<EntityBasic>(),
AvailableCompositeContentTypes = new List<EntityBasic>(),
DefaultTemplate = new EntityBasic(){ Alias = "test" },
@@ -165,15 +258,15 @@ namespace Umbraco.Tests.Models.Mapping
ParentId = -1,
Thumbnail = "tree-thumb",
IsContainer = true,
Groups = new List<PropertyTypeGroupDisplay>()
Groups = new List<PropertyGroupDisplay>()
{
new PropertyTypeGroupDisplay
new PropertyGroupDisplay
{
Id = 987,
Name = "Tab 1",
ParentGroupId = -1,
SortOrder = 0,
Inherited = false,
Inherited = false,
Properties = new List<PropertyTypeDisplay>
{
new PropertyTypeDisplay

51
src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
View File

@@ -1,15 +1,38 @@
angular.module("umbraco.directives.html")
.directive('umbEditorHeader', function () {
return {
transclude: true,
restrict: 'E',
replace: true,
scope: {
tabs: "=",
actions: "=",
name: "=",
menu: "="
},
templateUrl: 'views/components/editor/umb-editor-header.html'
};
});
.directive('umbEditorHeader', function (iconHelper) {
return {
transclude: true,
restrict: 'E',
replace: true,
scope: {
tabs: "=",
actions: "=",
name: "=",
menu: "=",
icon: "=",
alias: "=",
description: "=",
navigation: "="
},
templateUrl: 'views/components/editor/umb-editor-header.html',
link: function(scope, elem, attrs, ctrl) {
scope.pickIcon = function() {
scope.dialogModel = {};
scope.dialogModel.title = "Choose icon";
scope.dialogModel.view = "views/common/dialogs/iconpicker.html";
scope.showDialog = true;
/*
iconHelper.getIcons().then(function(icons){
scope.icons = icons;
});
*/
};
}
};
});

40
src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigation.directive.js Normal file
View File

@@ -0,0 +1,40 @@
angular.module("umbraco.directives")
.directive('umbEditorNavigation', function () {
return {
scope: {
navigation: "="
},
restrict: 'E',
replace: true,
templateUrl: 'views/components/editor/umb-editor-navigation.html',
link: function (scope, element, attrs, ctrl) {
scope.clickNavigationItem = function(selectedItem) {
setItemToActive(selectedItem);
runItemAction(selectedItem);
};
function runItemAction(selectedItem) {
if(selectedItem.action) {
selectedItem.action(selectedItem);
}
}
function setItemToActive(selectedItem) {
// set all other views to inactive
if(selectedItem.view) {
for (var index = 0; index < scope.navigation.length; index++) {
var item = scope.navigation[index];
item.active = false;
}
// set view to active
selectedItem.active = true;
}
}
}
};
});

40
src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorsubviews.directive.js Normal file
View File

@@ -0,0 +1,40 @@
angular.module("umbraco.directives")
.directive('umbEditorSubViews', function () {
return {
restrict: 'E',
replace: true,
templateUrl: 'views/components/editor/umb-editor-sub-views.html',
link: function (scope, element, attrs, ctrl) {
scope.tools = [];
scope.activeView = {};
// set toolbar from selected navigation item
function setToolBar(items) {
scope.tools = [];
for (var index = 0; index < items.length; index++) {
var item = items[index];
if(item.active && item.tools) {
scope.tools = item.tools;
}
if(item.active && item.view) {
scope.activeView = item;
}
}
}
// watch for navigation changes
scope.$watch('page.navigation', function(newValue, oldValue) {
if (newValue) {
setToolBar(newValue);
}
},true);
}
};
});

2
src/Umbraco.Web.UI.Client/src/less/belle.less
View File

@@ -90,6 +90,8 @@
@import "components/overlays.less";
@import "components/card.less";
@import "components/umb-sub-views";
@import "components/umb-editor-navigation";
@import "components/umb-editor-sub-views";
//page specific styles

25
src/Umbraco.Web.UI.Client/src/less/components/umb-editor-navigation.less Normal file
View File

@@ -0,0 +1,25 @@
.umb-sub-views-nav {
list-style: none;
display: flex;
margin: 0;
}
.umb-sub-views-nav-item {
text-align: center;
margin-left: 20px;
cursor: pointer;
}
.umb-sub-views-nav-item.is-active {
color: @blue;
}
.umb-sub-views-nav-item .icon {
font-size: 24px;
display: block;
text-align: center;
}
.umb-sub-views-nav-item-text {
font-size: 11px;
}

33
src/Umbraco.Web.UI.Client/src/less/components/umb-editor-sub-views.less Normal file
View File

@@ -0,0 +1,33 @@
/* --------- COLUMNS --------- */
.sub-view-columns {
display: flex;
margin-bottom: 40px;
}
.sub-view-columns h5 {
margin-top: 0;
}
.sub-view-column-left {
flex: 0 0 250px;
margin-right: 70px;
}
.sub-view-column-right {
flex: 1;
}
/* ---------- TOOLS ---------- */
.umb-editor-sub-views-tools {
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
height: 25px;
}
.umb-editor-sub-views-tool {
margin-left: 20px;
cursor: pointer;
}

4
src/Umbraco.Web.UI.Client/src/less/pages/document-type-editor.less
View File

@@ -42,10 +42,6 @@
/* ---------- TABS ---------- */
.content-type-groups-list {
margin-top: 90px; // compensate for tab-title position absolute
}
.edt-tab{
margin: 50px 0 0 0;
min-height: 145px;

55
src/Umbraco.Web.UI.Client/src/less/panel.less
View File

@@ -292,6 +292,19 @@
/* --------- UMB PANEL HEADER ---------- */
.umb-panel-content {
display: flex;
align-items: center;
height: 100px;
padding: 0 20px;
justify-content: space-between;
}
.umb-panel-meta {
display: flex;
align-items: center;
}
// icon
.umb-panel-header-icon {
width: 50px;
@@ -299,27 +312,55 @@
background: #ffffff;
border: 1px dashed @gray;
border-radius: 5px;
float: left;
text-align: center;
font-size: 11px;
line-height: 50px;
cursor: pointer;
margin-left: 15px;
margin-top: 15px;
margin: 0 5px 0 0;
opacity: 0.7;
}
.umb-panel-header-title-wrapper {
float: left;
width: 400px;
}
.umb-panel-header-name-wrapper {
display: flex;
align-items: center;
}
input.umb-panel-header-name {
border: 1px solid transparent;
background: transparent;
font-size: 16px;
color: #000000;
margin: 0 5px 0 0;
max-height: 25px;
&:hover {
background: #ffffff;
border: 1px solid #cccccc;
}
}
.umb-panel-header-alias {
margin-top: 5px;
margin-left: 20px;
font-size: 13px;
color: #cccccc;
cursor: pointer;
.icon {
margin-right: 5px;
}
}
input.umb-panel-header-description {
background: transparent;
border-color: transparent;
width: 35%;
min-width: 300px;
margin: -5px 0 0 0;
&:hover {
background: #ffffff;
border-color: #cccccc;
}
}

44
src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
View File

@@ -1,39 +1,42 @@
<div class="umb-panel-header">
<div class="row-fluid">
<div class="span7">
<div class="umb-panel-content">
<div class="umb-panel-meta">
<div class="umb-panel-header-icon" ng-click="pickIcon()">
<span>Add icon</span>
</div>
<div class="umb-panel-header-title-wrapper">
<!--
<umb-content-name
ng-disabled="content.isSystem == 1"
placeholder="@placeholders_entername"
ng-model="name">
</umb-content-name>
<div class="umb-panel-header-alias"><i class="icon icon-lock"></i>brandNew</div>
</div>
</div>
<div class="span5">
<div class="pull-right" style="padding: 20px 20px 0px 0px">
<!--
<umb-editor-actions actions="actions"></umb-editor-actions>
<umb-editor-menu ng-if="menu" menu="menu"></umb-editor-menu>
TEMP HACK
-->
<div class="btn-group">
<a class="btn" href="#" ng-click="getOptions()" prevent-default="" data-toggle="dropdown">
<localize key="general_actions" class="ng-isolate-scope ng-scope">Actions</localize>
<span class="caret"></span>
</a>
<div class="umb-panel-header-name-wrapper">
<input type="text" class="umb-panel-header-name" ng-model="name" placeholder="Enter name..." umb-auto-resize />
<div class="umb-panel-header-alias"><i class="icon icon-lock"></i>{{ alias }}</div>
</div>
<input type="text" class="umb-panel-header-description" ng-model="description" placeholder="Enter description..." />
</div>
</div>
<div ng-transclude></div>
<div class="umb-panel-header-actions">
<umb-editor-actions ng-if="actions" actions="actions"></umb-editor-actions>
<umb-editor-menu ng-if="menu" menu="menu"></umb-editor-menu>
<umb-editor-navigation ng-if="navigation" navigation="navigation"></umb-editor-navigation>
</div>
<!--
<div ng-transclude></div>
-->
</div>
<umb-overlay
@@ -45,5 +48,4 @@
view="dialogModel.view">
</umb-overlay>
</div>

6
src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html Normal file
View File

@@ -0,0 +1,6 @@
<ul class="umb-sub-views-nav">
<li class="umb-sub-views-nav-item" ng-repeat="item in navigation" ng-click="clickNavigationItem(item)" ng-class="{'is-active': item.active}">
<i class="icon icon-{{ item.icon }}"></i>
<span class="umb-sub-views-nav-item-text">{{ item.name }}</span>
</li>
</ul>

13
src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-views.html Normal file
View File

@@ -0,0 +1,13 @@
<div class="umb-editor-sub-views">
<div class="umb-editor-sub-views-tools">
<div class="umb-editor-sub-views-tool" ng-repeat="tool in tools" ng-click="tool.action(tool)">
<i class="icon-{{tool.icon}}"></i> {{ tool.name }}
</div>
</div>
<div ng-if="activeView.view && activeView.active" ng-include="activeView.view"></div>
<div ng-if="!activeView.view && activeView.active" ng-transclude></div>
</div>

40
src/Umbraco.Web.UI.Client/src/views/documenttype/edit.controller.js
View File

@@ -11,45 +11,43 @@ function DocumentTypeEditController($scope, $rootScope, $routeParams, $log, cont
$scope.page = {actions: [], menu: [], subViews: [] };
$scope.sortingMode = false;
$scope.page.subViews = [
$scope.page.navigation = [
{
"name": "Design",
"icon": "merge",
"view": "views/documentType/views/design/design.html",
"active": true,
"tools": [
{
"name": "Compositions",
"icon": "merge",
"action": function() {
$scope.openCompositionsDialog();
}
},
{
"name": "Reorder",
"icon": "navigation",
"action": function() {
$scope.toggleSortingMode();
}
{
"name": "Compositions",
"icon": "merge",
"action": function() {
$scope.openCompositionsDialog();
}
]
},
{
"name": "Reorder",
"icon": "navigation",
"action": function() {
$scope.toggleSortingMode();
}
}
]
},
{
"name": "List view",
"icon": "list",
"view": "views/documentType/views/listview/listview.html",
"tools": []
"view": "views/documentType/views/listview/listview.html"
},
{
"name": "Permissions",
"icon": "keychain",
"view": "views/documentType/views/permissions/permissions.html",
"tools": []
"view": "views/documentType/views/permissions/permissions.html"
},
{
"name": "Templates",
"icon": "article",
"view": "views/documentType/views/templates/templates.html",
"tools": []
"view": "views/documentType/views/templates/templates.html"
}
];

10
src/Umbraco.Web.UI.Client/src/views/documenttype/edit.html
View File

@@ -9,17 +9,21 @@
name="contentType.name"
alias="contentType.alias"
description="contentType.description"
menu="page.menu"
actions="page.menu">
navigation="page.navigation">
</umb-editor-header>
<umb-editor-container class="editors-document-type-container">
<div class="editors-document-type-canvas" ng-class="{'is-in-sorting-mode': sortingMode}">
<umb-sub-views></umb-sub-views>
<umb-editor-sub-views></umb-editor-sub-views>
<!--
<h2>Page</h2>
<pre>{{ page | json }}</pre>
<h2>Content type</h2>
<pre>{{ contentType | json }}</pre>
-->
</div>

26
src/Umbraco.Web/Editors/ContentTypeController.cs
View File

@@ -59,7 +59,7 @@ namespace Umbraco.Web.Editors
}
public Umbraco.Web.Models.ContentEditing.ContentTypeDisplay GetById(int id)
public ContentTypeDisplay GetById(int id)
{
var ct = Services.ContentTypeService.GetContentType(id);
if (ct == null)
@@ -67,14 +67,14 @@ namespace Umbraco.Web.Editors
throw new HttpResponseException(HttpStatusCode.NotFound);
}
var dto = Mapper.Map<IContentType, Umbraco.Web.Models.ContentEditing.ContentTypeDisplay>(ct);
var dto = Mapper.Map<IContentType, ContentTypeDisplay>(ct);
return dto;
}
public Umbraco.Web.Models.ContentEditing.ContentTypeDisplay GetEmpty()
public ContentTypeDisplay GetEmpty()
{
var ct = new ContentType(-1);
var dto = Mapper.Map<IContentType, Umbraco.Web.Models.ContentEditing.ContentTypeDisplay>(ct);
var dto = Mapper.Map<IContentType, ContentTypeDisplay>(ct);
return dto;
}
@@ -102,18 +102,17 @@ namespace Umbraco.Web.Editors
/// <summary>
/// Returns all content type objects
/// </summary>
/// <param name="contentId"></param>
public IEnumerable<ContentTypeBasic> GetAll()
{
var types = Services.ContentTypeService.GetAllContentTypes();
var basics = types.Select(Mapper.Map<IContentType, ContentTypeBasic>);
foreach (var basic in basics)
return basics.Select(basic =>
{
basic.Name = TranslateItem(basic.Name);
basic.Description = TranslateItem(basic.Description);
}
return basics;
return basic;
});
}
/// <summary>
@@ -166,10 +165,10 @@ namespace Umbraco.Web.Editors
var ctService = ApplicationContext.Services.ContentTypeService;
///TODO: warn on content type alias conflicts
///TODO: warn on property alias conflicts
//TODO: warn on content type alias conflicts
//TODO: warn on property alias conflicts
///TODO: Validate the submitted model
//TODO: Validate the submitted model
var ctId = Convert.ToInt32(contentType.Id);
@@ -196,8 +195,7 @@ namespace Umbraco.Web.Editors
contentType.Id = null;
//save as new
IContentType newCt = new ContentType(-1);
Mapper.Map(contentType, newCt);
var newCt = Mapper.Map<IContentType>(contentType);
ctService.Save(newCt);

4
src/Umbraco.Web/Models/ContentEditing/ContentTypeDisplay.cs
View File

@@ -17,7 +17,7 @@ namespace Umbraco.Web.Models.ContentEditing
AvailableCompositeContentTypes = new List<EntityBasic>();
AllowedContentTypes = new List<int>();
CompositeContentTypes = new List<string>();
Groups = new List<PropertyTypeGroupDisplay>();
Groups = new List<PropertyGroupDisplay>();
}
//name, alias, icon, thumb, desc, inherited from basic
@@ -55,6 +55,6 @@ namespace Umbraco.Web.Models.ContentEditing
//Tabs
[DataMember(Name = "groups")]
public IEnumerable<PropertyTypeGroupDisplay> Groups { get; set; }
public IEnumerable<PropertyGroupDisplay> Groups { get; set; }
}
}

4
src/Umbraco.Web/Models/ContentEditing/MemberTypeDisplay.cs
View File

@@ -13,13 +13,13 @@ namespace Umbraco.Web.Models.ContentEditing
public MemberTypeDisplay()
{
//initialize collections so at least their never null
Groups = new List<PropertyTypeGroupDisplay>();
Groups = new List<PropertyGroupDisplay>();
}
//name, alias, icon, thumb, desc, inherited from basic
//Tabs
[DataMember(Name = "groups")]
public IEnumerable<PropertyTypeGroupDisplay> Groups { get; set; }
public IEnumerable<PropertyGroupDisplay> Groups { get; set; }
}
}

6
src/Umbraco.Web/Models/ContentEditing/PropertyTypeGroupDisplay.cs → src/Umbraco.Web/Models/ContentEditing/PropertyGroupDisplay.cs
View File

@@ -7,10 +7,10 @@ using System.Threading.Tasks;
namespace Umbraco.Web.Models.ContentEditing
{
[DataContract(Name = "propertyTypeGroup", Namespace = "")]
public class PropertyTypeGroupDisplay
[DataContract(Name = "propertyGroup", Namespace = "")]
public class PropertyGroupDisplay
{
public PropertyTypeGroupDisplay()
public PropertyGroupDisplay()
{
Properties = new List<PropertyTypeDisplay>();
}

56
src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using AutoMapper;
using Umbraco.Core;
using Umbraco.Core.Models;
@@ -41,13 +42,13 @@ namespace Umbraco.Web.Models.Mapping
//only map id if set to something higher then zero
.ForMember(dto => dto.Id, expression => expression.Condition(display => (Convert.ToInt32(display.Id) > 0)))
.ForMember(dto => dto.Id, expression => expression.MapFrom(display => Convert.ToInt32(display.Id)))
.ForMember(dto => dto.AllowedAsRoot, expression => expression.MapFrom(display => display.AllowAsRoot))
.ForMember(dto => dto.CreatorId, expression => expression.Ignore())
.ForMember(dto => dto.Level, expression => expression.Ignore())
.ForMember(dto => dto.CreateDate, expression => expression.Ignore())
.ForMember(dto => dto.UpdateDate, expression => expression.Ignore())
.ForMember(dto => dto.SortOrder, expression => expression.Ignore())
//mapped in aftermap
.ForMember(dto => dto.AllowedContentTypes, expression => expression.Ignore())
@@ -56,50 +57,57 @@ namespace Umbraco.Web.Models.Mapping
.AfterMap((source, dest) =>
{
dest.PropertyGroups = new PropertyGroupCollection();
foreach (var groupDisplay in source.Groups.Where(x => !x.Name.IsNullOrWhiteSpace() ) )
foreach (var groupDisplay in source.Groups.Where(x => x.Name.IsNullOrWhiteSpace() == false ) )
{
dest.PropertyGroups.Add(Mapper.Map<PropertyGroup>(groupDisplay));
}
//Sync allowed child types
var allowedTypes = new List<ContentTypeSort>();
var proposedAllowed = source.AllowedContentTypes.ToArray();
for (int i = 0; i < proposedAllowed.Length; i++)
allowedTypes.Add(new ContentTypeSort(proposedAllowed[i], i));
var allowedTypes = source.AllowedContentTypes.Select((t, i) => new ContentTypeSort(t, i));
dest.AllowedContentTypes = allowedTypes;
//sync compositions
var current = dest.CompositionAliases();
var current = dest.CompositionAliases().ToArray();
var proposed = source.CompositeContentTypes;
var remove = current.Where(x => !proposed.Contains(x));
var add = proposed.Where(x => !current.Contains(x));
var remove = current.Where(x => proposed.Contains(x) == false);
var add = proposed.Where(x => current.Contains(x) == false);
foreach(var rem in remove)
foreach (var rem in remove)
{
dest.RemoveContentType(rem);
}
foreach(var a in add){
var add_ct = applicationContext.Services.ContentTypeService.GetContentType(a);
if(add_ct != null)
dest.AddContentType(add_ct);
foreach(var a in add)
{
//TODO: Remove N+1 lookup
var addCt = applicationContext.Services.ContentTypeService.GetContentType(a);
if(addCt != null)
dest.AddContentType(addCt);
}
});
config.CreateMap<ContentTypeSort, int>().ConvertUsing(x => x.Id.Value);
config.CreateMap<IContentTypeComposition, string>().ConvertUsing(x => x.Alias);
config.CreateMap<IContentType, ContentTypeDisplay>()
.ForMember(display => display.AllowAsRoot, expression => expression.MapFrom(type => type.AllowedAsRoot))
//Ignore because this is not actually used for content types
.ForMember(display => display.Trashed, expression => expression.Ignore())
.ForMember(
dto => dto.AllowedContentTypes,
expression => expression.MapFrom(dto => dto.AllowedContentTypes.Select(x => x.Id.Value)))
.ForMember(
dto => dto.AvailableCompositeContentTypes,
expression => expression.ResolveUsing(new AvailableCompositeContentTypesResolver(applicationContext)))
.ForMember(
dto => dto.CompositeContentTypes,
expression => expression.MapFrom(dto => dto.ContentTypeComposition) )
expression => expression.MapFrom(dto => dto.ContentTypeComposition))
.ForMember(
dto => dto.CompositeContentTypes,
@@ -109,10 +117,12 @@ namespace Umbraco.Web.Models.Mapping
dto => dto.Groups,
expression => expression.ResolveUsing(new PropertyTypeGroupResolver(applicationContext, _propertyEditorResolver)));
config.CreateMap<PropertyTypeGroupDisplay, PropertyGroup>()
config.CreateMap<PropertyGroupDisplay, PropertyGroup>()
.ForMember(dest => dest.Id, expression => expression.Condition(source => source.Id > 0))
.ForMember(g => g.CreateDate, expression => expression.Ignore())
.ForMember(g => g.CreateDate, expression => expression.Ignore())
.ForMember(g => g.Key, expression => expression.Ignore())
.ForMember(g => g.CreateDate, expression => expression.Ignore())
.ForMember(g => g.HasIdentity, expression => expression.Ignore())
.ForMember(g => g.UpdateDate, expression => expression.Ignore())
//only map if a parent is actually set
@@ -123,6 +133,8 @@ namespace Umbraco.Web.Models.Mapping
.ForMember(g => g.PropertyTypes, expression => expression.Ignore())
.AfterMap((source, destination) =>
{
destination.PropertyTypes = new PropertyTypeCollection();
foreach (var propertyTypeDisplay in source.Properties.Where(x => x.Label.IsNullOrWhiteSpace() == false ))
{
@@ -138,6 +150,10 @@ namespace Umbraco.Web.Models.Mapping
if (dataType == null) throw new NullReferenceException("No data type found with id " + propertyTypeDisplay.DataTypeId);
return new PropertyType(dataType, propertyTypeDisplay.Alias);
})
.ForMember(type => type.PropertyGroupId, expression => expression.MapFrom(display => new Lazy<int>(() => display.GroupId, LazyThreadSafetyMode.None)))
.ForMember(type => type.Key, expression => expression.Ignore())
.ForMember(type => type.HelpText, expression => expression.Ignore())
.ForMember(type => type.HasIdentity, expression => expression.Ignore())
//ignore because this is set in the ctor
.ForMember(type => type.Alias, expression => expression.Ignore())
//ignore because this is obsolete and shouldn't be used

37
src/Umbraco.Web/Models/Mapping/EntityModelMapper.cs
View File

@@ -47,25 +47,34 @@ namespace Umbraco.Web.Models.Mapping
config.CreateMap<ITemplate, EntityBasic>()
.ForMember(basic => basic.Icon, expression => expression.UseValue("icon-layout"))
.ForMember(basic => basic.Path, expression => expression.UseValue(""))
.ForMember(basic => basic.Path, expression => expression.MapFrom(template => template.Path))
.ForMember(basic => basic.ParentId, expression => expression.UseValue(-1))
.ForMember(dto => dto.Trashed, expression => expression.Ignore())
.ForMember(x => x.AdditionalData, expression => expression.Ignore());
config.CreateMap<EntityBasic, ITemplate>()
.ConstructUsing(basic => new Template(basic.Name, basic.Alias)
{
Id = Convert.ToInt32(basic.Id),
Key = basic.Key
})
.ForMember(t => t.Path, expression => expression.MapFrom(template => template.Path))
.ForMember(t => t.Id, expression => expression.MapFrom(template => Convert.ToInt32(template.Id)))
.ForMember(x => x.VirtualPath, expression => expression.Ignore())
.ForMember(x => x.CreateDate, expression => expression.Ignore())
.ForMember(x => x.UpdateDate, expression => expression.Ignore())
.ForMember(x => x.Content, expression => expression.Ignore());
config.CreateMap<EntityBasic, ContentTypeSort>()
.ForMember(x => x.Id, expression => expression.MapFrom(entity => new Lazy<int>(() => Convert.ToInt32(entity.Id))))
.ForMember(x => x.SortOrder, expression => expression.Ignore());
config.CreateMap<IContentTypeComposition, EntityBasic>()
.ForMember(basic => basic.Path, expression => expression.UseValue(""))
.ForMember(basic => basic.ParentId, expression => expression.UseValue(-1))
.ForMember(dto => dto.Trashed, expression => expression.Ignore())
.ForMember(x => x.AdditionalData, expression => expression.Ignore());
config.CreateMap<ContentTypeSort, EntityBasic>()
.ForMember(basic => basic.Icon, expression => expression.UseValue("icon-grid"))
.ForMember(basic => basic.Path, expression => expression.UseValue(""))
.ForMember(basic => basic.ParentId, expression => expression.UseValue(-1))
.ForMember(dto => dto.Trashed, expression => expression.Ignore())
.ForMember(x => x.AdditionalData, expression => expression.Ignore());
.ForMember(basic => basic.Icon, expression => expression.UseValue("icon-grid"))
.ForMember(basic => basic.Path, expression => expression.MapFrom(x => x.Path))
.ForMember(basic => basic.ParentId, expression => expression.MapFrom(x => x.ParentId))
.ForMember(dto => dto.Trashed, expression => expression.Ignore())
.ForMember(x => x.AdditionalData, expression => expression.Ignore());
config.CreateMap<SearchResult, EntityBasic>()
//default to document icon

17
src/Umbraco.Web/Models/Mapping/PropertyTypeGroupResolver.cs
View File

@@ -11,8 +11,9 @@ using Umbraco.Web.Models.ContentEditing;
namespace Umbraco.Web.Models.Mapping
{
internal class PropertyTypeGroupResolver : ValueResolver<IContentTypeComposition, IEnumerable<PropertyTypeGroupDisplay>>
internal class PropertyTypeGroupResolver : ValueResolver<IContentTypeComposition, IEnumerable<PropertyGroupDisplay>>
{
private readonly ApplicationContext _applicationContext;
private readonly Lazy<PropertyEditorResolver> _propertyEditorResolver;
@@ -24,9 +25,9 @@ namespace Umbraco.Web.Models.Mapping
}
protected override IEnumerable<PropertyTypeGroupDisplay> ResolveCore(IContentTypeComposition source)
protected override IEnumerable<PropertyGroupDisplay> ResolveCore(IContentTypeComposition source)
{
var groups = new Dictionary<int,PropertyTypeGroupDisplay>();
var groups = new Dictionary<int,PropertyGroupDisplay>();
//for storing generic properties
var genericProperties = new List<PropertyTypeDisplay>();
@@ -37,7 +38,7 @@ namespace Umbraco.Web.Models.Mapping
{
//process each tab
foreach(var tab in ct.CompositionPropertyGroups){
var group = new PropertyTypeGroupDisplay() { Id = tab.Id, Inherited = true, Name = tab.Name, SortOrder = tab.SortOrder };
var group = new PropertyGroupDisplay() { Id = tab.Id, Inherited = true, Name = tab.Name, SortOrder = tab.SortOrder };
group.ContentTypeId = ct.Id;
group.ParentTabContentTypes = new[] { ct.Id };
group.ParentTabContentTypeNames = new[] { ct.Name };
@@ -60,7 +61,7 @@ namespace Umbraco.Web.Models.Mapping
//pull from own groups
foreach (var ownTab in source.CompositionPropertyGroups)
{
PropertyTypeGroupDisplay group;
PropertyGroupDisplay group;
//if already added
if (groups.ContainsKey(ownTab.Id))
@@ -73,7 +74,7 @@ namespace Umbraco.Web.Models.Mapping
else
{
//if own
group = new PropertyTypeGroupDisplay() { Id = ownTab.Id, Inherited = false, Name = ownTab.Name, SortOrder = ownTab.SortOrder, ContentTypeId = source.Id };
group = new PropertyGroupDisplay() { Id = ownTab.Id, Inherited = false, Name = ownTab.Name, SortOrder = ownTab.SortOrder, ContentTypeId = source.Id };
groups.Add(ownTab.Id, group);
}
@@ -94,7 +95,7 @@ namespace Umbraco.Web.Models.Mapping
if (genericProperties.Any())
{
var genericTab = new PropertyTypeGroupDisplay() { Id = 0, Name = "Generic properties", ParentGroupId = 0, ContentTypeId = source.Id, SortOrder = 999, Inherited = false };
var genericTab = new PropertyGroupDisplay() { Id = 0, Name = "Generic properties", ParentGroupId = 0, ContentTypeId = source.Id, SortOrder = 999, Inherited = false };
groups.Add(0, genericTab);
}
@@ -103,7 +104,7 @@ namespace Umbraco.Web.Models.Mapping
var nameGroupedGroups = groups.Values.GroupBy(x => x.Name);
if (nameGroupedGroups.Any(x => x.Count() > 1))
{
var sortedGroups = new List<PropertyTypeGroupDisplay>();
var sortedGroups = new List<PropertyGroupDisplay>();
foreach (var groupOfGroups in nameGroupedGroups)
{

2
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -307,7 +307,7 @@
<Compile Include="Models\ContentEditing\ContentTypeDisplay.cs" />
<Compile Include="Models\ContentEditing\MemberTypeDisplay.cs" />
<Compile Include="Models\ContentEditing\PropertyTypeDisplay.cs" />
<Compile Include="Models\ContentEditing\PropertyTypeGroupDisplay.cs" />
<Compile Include="Models\ContentEditing\PropertyGroupDisplay.cs" />
<Compile Include="Models\Mapping\AvailableCompositeContentTypesResolver.cs" />
<Compile Include="Models\Mapping\MemberTypeModelMapper.cs" />
<Compile Include="Models\Mapping\PropertyTypeGroupResolver.cs" />