Skip to content

Commit 8703d7c

Browse files
Jacob Overgaardmikecp
Jacob Overgaard
authored and
mikecp
committed
Rename importdocumenttype to importDocumentType and emptyrecyclebin to emptyRecycleBin to match UI and mocks
1 parent 14fe7d9 commit 8703d7c

File tree

24 files changed

+58
-55
lines changed

24 files changed

+58
-55
lines changed

‎src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ AppCaches appCaches
6868
/// <param name="id"></param>
6969
/// <param name="queryStrings"></param>
7070
/// <returns></returns>
71-
public ActionResult<TreeNode> GetTreeNode([FromRoute] string id, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormCollection queryStrings)
71+
public ActionResult<TreeNode> GetTreeNode([FromRoute] string id, [ModelBinder(typeof(HttpQueryStringModelBinder))] FormCollection queryStrings)
7272
{
7373
int asInt;
7474
Guid asGuid = Guid.Empty;
@@ -325,7 +325,8 @@ private IEnumerable<IEntitySlim> GetChildrenFromEntityService(int entityId)
325325
/// <returns></returns>
326326
protected bool HasPathAccess(IUmbracoEntity entity, FormCollection queryStrings)
327327
{
328-
if (entity == null) return false;
328+
if (entity == null)
329+
return false;
329330
return RecycleBinId == Constants.System.RecycleBinContent
330331
? _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.HasContentPathAccess(entity, _entityService, _appCaches)
331332
: _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.HasMediaPathAccess(entity, _entityService, _appCaches);
@@ -469,13 +470,13 @@ protected sealed override ActionResult<MenuItemCollection> GetMenuForNode(string
469470
// only add empty recycle bin if the current user is allowed to delete by default
470471
if (deleteAllowed)
471472
{
472-
menu.Items.Add(new MenuItem("emptyrecyclebin", LocalizedTextService)
473-
{
474-
Icon = "trash",
475-
OpensDialog = true
476-
});
477-
menu.Items.Add(new RefreshNode(LocalizedTextService, true));
478-
}
473+
menu.Items.Add(new MenuItem("emptyRecycleBin", LocalizedTextService)
474+
{
475+
Icon = "trash",
476+
OpensDialog = true
477+
});
478+
menu.Items.Add(new RefreshNode(LocalizedTextService, true));
479+
}
479480
return menu;
480481
}
481482

@@ -608,7 +609,8 @@ internal IEntitySlim GetEntityFromId(string id)
608609
/// <returns></returns>
609610
internal bool IgnoreUserStartNodes(FormCollection queryStrings)
610611
{
611-
if (_ignoreUserStartNodes.HasValue) return _ignoreUserStartNodes.Value;
612+
if (_ignoreUserStartNodes.HasValue)
613+
return _ignoreUserStartNodes.Value;
612614

613615
var dataTypeKey = queryStrings.GetValue<Guid?>(TreeQueryStringParameters.DataTypeKey);
614616
_ignoreUserStartNodes = dataTypeKey.HasValue && _dataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeKey.Value);

‎src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ protected override ActionResult<TreeNodeCollection> GetTreeNodes(string id, Form
7676
}));
7777

7878
//if the request is for folders only then just return
79-
if (queryStrings["foldersonly"].ToString().IsNullOrWhiteSpace() == false && queryStrings["foldersonly"] == "1") return nodes;
79+
if (queryStrings["foldersonly"].ToString().IsNullOrWhiteSpace() == false && queryStrings["foldersonly"] == "1")
80+
return nodes;
8081

8182
var children = _entityService.GetChildren(intId, UmbracoObjectTypes.DocumentType).ToArray();
8283
var contentTypes = _contentTypeService.GetAll(children.Select(c => c.Id).ToArray()).ToDictionary(c => c.Id);
@@ -117,7 +118,7 @@ protected override ActionResult<MenuItemCollection> GetMenuForNode(string id, Fo
117118

118119
// root actions
119120
menu.Items.Add<ActionNew>(LocalizedTextService, opensDialog: true);
120-
menu.Items.Add(new MenuItem("importdocumenttype", LocalizedTextService)
121+
menu.Items.Add(new MenuItem("importDocumentType", LocalizedTextService)
121122
{
122123
Icon = "page-up",
123124
SeparatorBefore = true,

‎src/Umbraco.Web.UI.Client/src/common/mocks/resources/tree.mocks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ angular.module('umbraco.mocks').
2828

2929
{ separator: true, name: "Reload", cssclass: "refresh", alias: "users", metaData: {} },
3030

31-
{ separator: true, name: "Empty Recycle Bin", cssclass: "trash", alias: "emptyrecyclebin", metaData: {} }
31+
{ separator: true, name: "Empty Recycle Bin", cssclass: "trash", alias: "emptyRecycleBin", metaData: {} }
3232
];
3333

3434
var result = {

‎src/Umbraco.Web.UI/umbraco/config/lang/cs.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
<key alias="createGroup">Vytvořit skupinu</key>
1717
<key alias="delete">Odstranit</key>
1818
<key alias="disable">Deaktivovat</key>
19-
<key alias="emptyrecyclebin">Vyprázdnit koš</key>
19+
<key alias="emptyRecycleBin">Vyprázdnit koš</key>
2020
<key alias="enable">Aktivovat</key>
2121
<key alias="exportDocumentType">Exportovat typ dokumentu</key>
22-
<key alias="importdocumenttype">Importovat typ dokumentu</key>
22+
<key alias="importDocumentType">Importovat typ dokumentu</key>
2323
<key alias="importPackage">Importovat balíček</key>
2424
<key alias="liveEdit">Editovat na stránce</key>
2525
<key alias="logout">Odhlásit</key>

‎src/Umbraco.Web.UI/umbraco/config/lang/cy.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
<key alias="delete">Dileu</key>
1919
<key alias="disable">Analluogi</key>
2020
<key alias="editSettings">Golygu gosodiadau</key>
21-
<key alias="emptyrecyclebin">Gwagu bin ailgylchu</key>
21+
<key alias="emptyRecycleBin">Gwagu bin ailgylchu</key>
2222
<key alias="enable">Galluogi</key>
2323
<key alias="exportDocumentType">Allforio Math o Ddogfen</key>
24-
<key alias="importdocumenttype">Mewnforio Math o Ddogfen</key>
24+
<key alias="importDocumentType">Mewnforio Math o Ddogfen</key>
2525
<key alias="importPackage">Mewnforio Pecyn</key>
2626
<key alias="liveEdit">Golygu mewn Cynfas</key>
2727
<key alias="logout">Gadael</key>

‎src/Umbraco.Web.UI/umbraco/config/lang/da.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
<key alias="delete">Slet</key>
1919
<key alias="disable">Deaktivér</key>
2020
<key alias="editSettings">Edit settings</key>
21-
<key alias="emptyrecyclebin">Tøm papirkurv</key>
21+
<key alias="emptyRecycleBin">Tøm papirkurv</key>
2222
<key alias="enable">Aktivér</key>
2323
<key alias="exportDocumentType">Eksportér dokumenttype</key>
24-
<key alias="importdocumenttype">Importér dokumenttype</key>
24+
<key alias="importDocumentType">Importér dokumenttype</key>
2525
<key alias="importPackage">Importér pakke</key>
2626
<key alias="liveEdit">Redigér i Canvas</key>
2727
<key alias="logout">Log af</key>

‎src/Umbraco.Web.UI/umbraco/config/lang/de.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
<key alias="createGroup">Neue Gruppe</key>
1717
<key alias="delete">Entfernen</key>
1818
<key alias="disable">Deaktivieren</key>
19-
<key alias="emptyrecyclebin">Papierkorb leeren</key>
19+
<key alias="emptyRecycleBin">Papierkorb leeren</key>
2020
<key alias="enable">Aktivieren</key>
2121
<key alias="exportDocumentType">Dokumenttyp exportieren</key>
22-
<key alias="importdocumenttype">Dokumenttyp importieren</key>
22+
<key alias="importDocumentType">Dokumenttyp importieren</key>
2323
<key alias="importPackage">Paket importieren</key>
2424
<key alias="liveEdit">'Canvas'-Modus starten</key>
2525
<key alias="logout">Abmelden</key>

‎src/Umbraco.Web.UI/umbraco/config/lang/en.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
<key alias="delete">Delete</key>
1818
<key alias="disable">Disable</key>
1919
<key alias="editSettings">Edit settings</key>
20-
<key alias="emptyrecyclebin">Empty recycle bin</key>
20+
<key alias="emptyRecycleBin">Empty recycle bin</key>
2121
<key alias="enable">Enable</key>
2222
<key alias="exportDocumentType">Export Document Type</key>
23-
<key alias="importdocumenttype">Import Document Type</key>
23+
<key alias="importDocumentType">Import Document Type</key>
2424
<key alias="importPackage">Import Package</key>
2525
<key alias="liveEdit">Edit in Canvas</key>
2626
<key alias="logout">Exit</key>

‎src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
<key alias="delete">Delete</key>
1919
<key alias="disable">Disable</key>
2020
<key alias="editSettings">Edit settings</key>
21-
<key alias="emptyrecyclebin">Empty recycle bin</key>
21+
<key alias="emptyRecycleBin">Empty recycle bin</key>
2222
<key alias="enable">Enable</key>
2323
<key alias="exportDocumentType">Export Document Type</key>
24-
<key alias="importdocumenttype">Import Document Type</key>
24+
<key alias="importDocumentType">Import Document Type</key>
2525
<key alias="importPackage">Import Package</key>
2626
<key alias="liveEdit">Edit in Canvas</key>
2727
<key alias="logout">Exit</key>

‎src/Umbraco.Web.UI/umbraco/config/lang/es.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<key alias="createGroup">Crear grupo</key>
1616
<key alias="delete">Borrar</key>
1717
<key alias="disable">Deshabilitar</key>
18-
<key alias="emptyrecyclebin">Vaciar Papelera</key>
18+
<key alias="emptyRecycleBin">Vaciar Papelera</key>
1919
<key alias="enable">Activar</key>
2020
<key alias="exportDocumentType">Exportar Documento (tipo)</key>
21-
<key alias="importdocumenttype">Importar Documento (tipo)</key>
21+
<key alias="importDocumentType">Importar Documento (tipo)</key>
2222
<key alias="importPackage">Importar Paquete</key>
2323
<key alias="liveEdit">Editar en vivo</key>
2424
<key alias="logout">Cerrar sesión</key>

0 commit comments

Comments
 (0)