From 1726e9a65ff169bca2e10bde17938a118cfe263e Mon Sep 17 00:00:00 2001 From: Jeremy Shipman Date: Wed, 19 Sep 2007 01:24:43 +0000 Subject: [PATCH] Fixed CMS sort sub-pages bug git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.1.0@42287 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/LeftAndMain.php | 7 +++++-- javascript/CMSMain_left.js | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index b8a33ad949..9b91ff17e8 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -599,8 +599,11 @@ public function ajaxupdatesort() { $_REQUEST['ajax'] = 1; if(is_array($_REQUEST['ID'])) { - $movedNode = DataObject::get_by_id($className, $_REQUEST['MovedNodeID']); - + if($_REQUEST['MovedNodeID']==0){ //Sorting root + $movedNode = DataObject::get($className, "`ParentID`=0"); + }else{ + $movedNode = DataObject::get_by_id($className, $_REQUEST['MovedNodeID']); + } foreach($_REQUEST['ID'] as $id) { if($id == $movedNode->ID) { $movedNode->Sort = ++$counter; diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js index 909f7585a5..278b96d629 100755 --- a/javascript/CMSMain_left.js +++ b/javascript/CMSMain_left.js @@ -265,6 +265,6 @@ TreeContextMenu = { treeNode.appendTreeNode(child); } - treeNode.onOrderChanged(sortedChildren); + treeNode.onOrderChanged(sortedChildren,treeNode); } }; \ No newline at end of file