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

Null checks for when using folders.

Browse Source 
Updated tree menu items.
This commit is contained in:
Claus
2016-01-07 16:56:32 +01:00
parent a7212f6b60
commit 4db1599bcb
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,12 +191,10 @@ namespace Umbraco.Web.Editors
parentId != Constants.System.Root)
{
var parent = Services.ContentTypeService.GetContentType(parentId);
ct = new ContentType(parent, String.Empty);
ct = parent != null ? new ContentType(parent, String.Empty) : new ContentType(parentId);
}
else
{
ct = new ContentType(parentId);
}
ct.Icon = "icon-document";

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

@@ -129,7 +129,8 @@ namespace Umbraco.Web.Editors
if (parentId > 0)
{
var parent = allContentTypes.FirstOrDefault(x => x.Id == parentId);
ancestorIds = parent.Path.Split(',').Select(int.Parse).ToArray();
if (parent != null)
ancestorIds = parent.Path.Split(',').Select(int.Parse).ToArray();
}
// add all ancestors as compositions (since they are implicitly compositions by inheritance)

10
src/Umbraco.Web/Trees/ContentTypeTreeController.cs
View File

@@ -95,7 +95,7 @@ namespace Umbraco.Web.Trees
if (container.HasChildren() == false)
{
//can delete doc type
menu.Items.Add<ActionDelete>(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias)));
menu.Items.Add<ActionDelete>(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias)), true);
}
menu.Items.Add<RefreshNode, ActionRefresh>(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true);
}
@@ -104,8 +104,12 @@ namespace Umbraco.Web.Trees
if (enableInheritedDocumentTypes)
{
menu.Items.Add<ActionNew>(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias)));
menu.Items.Add<ActionMove>(Services.TextService.Localize(string.Format("actions/{0}", ActionMove.Instance.Alias)), true);
}
else
{
menu.Items.Add<ActionMove>(Services.TextService.Localize(string.Format("actions/{0}", ActionMove.Instance.Alias)));
}
menu.Items.Add<ActionMove>(Services.TextService.Localize(string.Format("actions/{0}", ActionMove.Instance.Alias)));
menu.Items.Add<ActionExport>(Services.TextService.Localize(string.Format("actions/{0}", ActionExport.Instance.Alias)), true).ConvertLegacyMenuItem(new UmbracoEntity
{
Id = int.Parse(id),
@@ -114,6 +118,8 @@ namespace Umbraco.Web.Trees
Name = ""
}, "documenttypes", "settings");
menu.Items.Add<ActionDelete>(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias)), true);
if (enableInheritedDocumentTypes)
menu.Items.Add<RefreshNode, ActionRefresh>(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), true);
}
return menu;