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 '3.5' into 3.6

Browse Source
This commit is contained in:
Daniel Hensby 2017-10-20 11:03:25 +01:00
commit 9e903f801f
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
5 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/controllers/CMSFileAddController.php
View File

@ -102,6 +102,11 @@ class CMSFileAddController extends LeftAndMain {
)
);
$form->loadDataFrom($folder);
if($this->currentPageID()){
// Make sure this controller know current folder when AJAX 'fileexists' is fired.
$uploadField->setConfig('urlFileExists', Controller::join_links($uploadField->link('fileexists'), '?ID=' . $this->currentPageID()));
}
$this->extend('updateEditForm', $form);

2
code/controllers/CMSMain.php
View File

@ -1247,7 +1247,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
$id = (isset($data['ID'])) ? (int) $data['ID'] : null;
$version = (isset($data['Version'])) ? (int) $data['Version'] : null;
$record = DataObject::get_by_id($this->stat('tree_class'), $id);
$record = Versioned::get_latest_version($this->stat('tree_class'), $id);
if($record && !$record->canEdit()) return Security::permissionFailure($this);
if($version) {

4
code/model/SiteTree.php
View File

@ -1575,7 +1575,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
parent::onBeforeDelete();
// If deleting this page, delete all its children.
if(SiteTree::config()->enforce_strict_hierarchy && $children = $this->AllChildren()) {
if($this->isInDB() && SiteTree::config()->enforce_strict_hierarchy && $children = $this->AllChildren()) {
foreach($children as $child) {
$child->delete();
}
@ -2837,7 +2837,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
}
$flags = $this->getStatusFlags();
$treeTitle = sprintf(
"<span class=\"jstree-pageicon page-icon class-%s\"></span><span class=\"item\" data-allowedchildren=\"%s\">%s</span>",
"<span class=\"jstree-pageicon class-%s\"></span><span class=\"item\" data-allowedchildren=\"%s\">%s</span>",
Convert::raw2htmlid($this->class),
Convert::raw2att(Convert::raw2json($children)),
Convert::raw2xml(str_replace(array("\n","\r"),"",$this->MenuTitle))

3
javascript/CMSMain.EditForm.js
View File

@ -254,8 +254,7 @@
*
* A "rollback" to a specific version needs user confirmation.
*/
$('.cms-edit-form .Actions #Form_EditForm_action_rollback').entwine({
$('.cms-edit-form .Actions #Form_EditForm_action_doRollback').entwine({
/**
* Function: onclick
*

20
tests/model/SiteTreeTest.php
View File

@ -276,7 +276,25 @@ class SiteTreeTest extends SapphireTest {
}
public function testGetByLink() {
public function testNoCascadingDeleteWithoutID() {
Config::inst()->update('SiteTree', 'enforce_strict_hierarchy', true);
$count = SiteTree::get()->count();
$this->assertNotEmpty($count);
$obj = new SiteTree();
$this->assertFalse($obj->exists());
$fail = true;
try {
$obj->delete();
} catch (LogicException $e) {
$fail = false;
}
if ($fail) {
$this->fail('Failed to throw delete exception');
}
$this->assertCount($count, SiteTree::get());
}
public function testGetByLink() {
$home = $this->objFromFixture('Page', 'home');
$about = $this->objFromFixture('Page', 'about');
$staff = $this->objFromFixture('Page', 'staff');