tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.10' into 4

Browse Source
This commit is contained in:
Steve Boyd 2022-02-01 13:58:32 +13:00
commit 6ab92e8f74
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/Model/SiteTree.php
View File

@ -2172,7 +2172,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
); );
$parentType->addExtraClass('noborder'); $parentType->addExtraClass('noborder');
$visibility->setTitle($this->fieldLabel('Visibility')); $visibility->setName('Visibility')->setTitle($this->fieldLabel('Visibility'));
// This filter ensures that the ParentID dropdown selection does not show this node, // This filter ensures that the ParentID dropdown selection does not show this node,

1
package.json
View File

@ -82,6 +82,7 @@
} }
}, },
"resolutions": { "resolutions": {
"colors": "1.1.2",
"eslint": "^4.6.1" "eslint": "^4.6.1"
}, },
"babel": { "babel": {