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

ENHANCEMENT Passing $minNodeCount through Hierarchy->getChildrenAsUL() and Hierarchy->markPartialTree() (from r78305)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@81465 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2009-07-09 05:53:40 +00:00
parent c0aca8ff87
commit ceb0afeb78
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/model/Hierarchy.php
View File

@ -27,9 +27,10 @@ class Hierarchy extends DataObjectDecorator {
* @param boolean $limitToMarked Display only marked children. * @param boolean $limitToMarked Display only marked children.
* @param string $childrenMethod The name of the method used to get children from each object * @param string $childrenMethod The name of the method used to get children from each object
* @param boolean $rootCall Set to true for this first call, and then to false for calls inside the recursion. You should not change this. * @param boolean $rootCall Set to true for this first call, and then to false for calls inside the recursion. You should not change this.
* @param int $minNodeCount
* @return string * @return string
*/ */
public function getChildrenAsUL($attributes = "", $titleEval = '"<li>" . $child->Title', $extraArg = null, $limitToMarked = false, $childrenMethod = "AllChildrenIncludingDeleted", $rootCall = true) { public function getChildrenAsUL($attributes = "", $titleEval = '"<li>" . $child->Title', $extraArg = null, $limitToMarked = false, $childrenMethod = "AllChildrenIncludingDeleted", $rootCall = true, $minNodeCount = 30) {
if($limitToMarked && $rootCall) { if($limitToMarked && $rootCall) {
$this->markingFinished(); $this->markingFinished();
} }
@ -52,7 +53,7 @@ class Hierarchy extends DataObjectDecorator {
if(!$limitToMarked || $child->isMarked()) { if(!$limitToMarked || $child->isMarked()) {
$foundAChild = true; $foundAChild = true;
$output .= eval("return $titleEval;") . "\n" . $output .= eval("return $titleEval;") . "\n" .
$child->getChildrenAsUL("", $titleEval, $extraArg, $limitToMarked, $childrenMethod, false) . "</li>\n"; $child->getChildrenAsUL("", $titleEval, $extraArg, $limitToMarked, $childrenMethod, false, $minNodeCount) . "</li>\n";
} }
} }
@ -72,18 +73,19 @@ class Hierarchy extends DataObjectDecorator {
* This method returns the number of nodes marked. After this method is called other methods * This method returns the number of nodes marked. After this method is called other methods
* can check isExpanded() and isMarked() on individual nodes. * can check isExpanded() and isMarked() on individual nodes.
* *
* @param int $minCount The minimum amount of nodes to mark. * @param int $minNodeCount The minimum amount of nodes to mark.
* @return int The actual number of nodes marked. * @return int The actual number of nodes marked.
*/ */
public function markPartialTree($minCount = 30, $context = null, $childrenMethod = "AllChildrenIncludingDeleted") { public function markPartialTree($minNodeCount = 30, $context = null, $childrenMethod = "AllChildrenIncludingDeleted") {
if(!is_numeric($minNodeCount)) $minNodeCount = 30;
$this->markedNodes = array($this->owner->ID => $this->owner); $this->markedNodes = array($this->owner->ID => $this->owner);
$this->owner->markUnexpanded(); $this->owner->markUnexpanded();
// foreach can't handle an ever-growing $nodes list // foreach can't handle an ever-growing $nodes list
while(list($id, $node) = each($this->markedNodes)) { while(list($id, $node) = each($this->markedNodes)) {
$this->markChildren($node, $context, $childrenMethod); $this->markChildren($node, $context, $childrenMethod);
if($minNodeCount && sizeof($this->markedNodes) >= $minNodeCount) {
if($minCount && sizeof($this->markedNodes) >= $minCount) {
break; break;
} }
} }