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

Just a bit of code cleanup

Browse Source
This commit is contained in:
Sebastiaan Janssen
2018-09-26 18:01:50 +02:00
parent 5832387484
commit 3940176f23
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Umbraco.Web/Trees/DataTypeTreeController.cs
View File

@@ -1,19 +1,14 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Net;
using System.Net.Http.Formatting; using System.Net.Http.Formatting;
using System.Web.Http;
using AutoMapper; using AutoMapper;
using Umbraco.Core; using Umbraco.Core;
using Umbraco.Core.Models; using Umbraco.Core.Models;
using Umbraco.Web.Models.Trees; using Umbraco.Web.Models.Trees;
using Umbraco.Web.Mvc; using Umbraco.Web.Mvc;
using Umbraco.Web.WebApi.Filters; using Umbraco.Web.WebApi.Filters;
using umbraco;
using umbraco.BusinessLogic.Actions; using umbraco.BusinessLogic.Actions;
using Umbraco.Core.Models.EntityBase;
using Umbraco.Core.Services; using Umbraco.Core.Services;
using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Models.ContentEditing;
using Umbraco.Web.Search; using Umbraco.Web.Search;
@@ -107,8 +102,8 @@ namespace Umbraco.Web.Trees
menu.DefaultMenuAlias = ActionNew.Instance.Alias; menu.DefaultMenuAlias = ActionNew.Instance.Alias;
// root actions // root actions
menu.Items.Add<ActionNew>(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))); menu.Items.Add<ActionNew>(Services.TextService.Localize($"actions/{ActionNew.Instance.Alias}"));
menu.Items.Add<RefreshNode, ActionRefresh>(ui.Text("actions", ActionRefresh.Instance.Alias), true); menu.Items.Add<RefreshNode, ActionRefresh>(Services.TextService.Localize($"actions/{ActionRefresh.Instance.Alias}"), hasSeparator: true);
return menu; return menu;
} }
@@ -118,31 +113,28 @@ namespace Umbraco.Web.Trees
//set the default to create //set the default to create
menu.DefaultMenuAlias = ActionNew.Instance.Alias; menu.DefaultMenuAlias = ActionNew.Instance.Alias;
menu.Items.Add<ActionNew>(Services.TextService.Localize(string.Format("actions/{0}", ActionNew.Instance.Alias))); menu.Items.Add<ActionNew>(Services.TextService.Localize($"actions/{ActionNew.Instance.Alias}"));
menu.Items.Add(new MenuItem("rename", Services.TextService.Localize(String.Format("actions/{0}", "rename"))) menu.Items.Add(new MenuItem("rename", Services.TextService.Localize("actions/rename"))
{ {
Icon = "icon icon-edit" Icon = "icon icon-edit"
}); });
if (container.HasChildren() == false) if (container.HasChildren() == false)
{
//can delete data type //can delete data type
menu.Items.Add<ActionDelete>(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias))); menu.Items.Add<ActionDelete>(Services.TextService.Localize($"actions/{ActionDelete.Instance.Alias}"));
}
menu.Items.Add<RefreshNode, ActionRefresh>(Services.TextService.Localize(string.Format("actions/{0}", ActionRefresh.Instance.Alias)), hasSeparator: true); menu.Items.Add<RefreshNode, ActionRefresh>(Services.TextService.Localize($"actions/{ActionRefresh.Instance.Alias}"), hasSeparator: true);
} }
else else
{ {
var sysIds = GetNonDeletableSystemDataTypeIds(); var nonDeletableSystemDataTypeIds = GetNonDeletableSystemDataTypeIds();
if (sysIds.Contains(int.Parse(id)) == false) if (nonDeletableSystemDataTypeIds.Contains(int.Parse(id)) == false)
{ menu.Items.Add<ActionDelete>(Services.TextService.Localize($"actions/{ActionDelete.Instance.Alias}"));
menu.Items.Add<ActionDelete>(Services.TextService.Localize(string.Format("actions/{0}", ActionDelete.Instance.Alias)));
}
menu.Items.Add<ActionMove>(Services.TextService.Localize(string.Format("actions/{0}", ActionMove.Instance.Alias)), hasSeparator: true); menu.Items.Add<ActionMove>(Services.TextService.Localize($"actions/{ActionMove.Instance.Alias}"), hasSeparator: true);
} }
return menu; return menu;
@@ -154,4 +146,4 @@ namespace Umbraco.Web.Trees
return Mapper.Map<IEnumerable<SearchResultItem>>(results); return Mapper.Map<IEnumerable<SearchResultItem>>(results);
} }
} }
} }