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

Merge 3.4 into 3.5

Browse Source
This commit is contained in:
Damian Mooyman 2017-02-08 10:01:14 +13:00
commit 89a927d152
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/code/LeftAndMain.php
View File

@ -1013,7 +1013,8 @@ class LeftAndMain extends Controller implements PermissionProvider {
} }
$link = Controller::join_links($recordController->Link("show"), $record->ID); $link = Controller::join_links($recordController->Link("show"), $record->ID);
$html = LeftAndMain_TreeNode::create($record, $link, $this->isCurrentPage($record))->forTemplate(); $html = LeftAndMain_TreeNode::create($record, $link, $this->isCurrentPage($record))
->forTemplate() . '</li>';
$data[$id] = array( $data[$id] = array(
'html' => $html, 'html' => $html,

1
admin/templates/Includes/LeftAndMain_TreeNode.ss
View File

@ -3,4 +3,3 @@
<a href="$Link" title="$Title.ATT"><ins class="jstree-icon">&nbsp;</ins> <a href="$Link" title="$Title.ATT"><ins class="jstree-icon">&nbsp;</ins>
<span class="text">$TreeTitle</span> <span class="text">$TreeTitle</span>
</a> </a>
</li>

6
model/Hierarchy.php
View File

@ -127,7 +127,7 @@ class Hierarchy extends DataExtension {
* *
* @return string * @return string
*/ */
public function getChildrenAsUL($attributes = "", $titleEval = '"<li>" . $child->Title . "</li>"', $extraArg = null, public function getChildrenAsUL($attributes = "", $titleEval = '"<li>" . $child->Title', $extraArg = null,
$limitToMarked = false, $childrenMethod = "AllChildrenIncludingDeleted", $limitToMarked = false, $childrenMethod = "AllChildrenIncludingDeleted",
$numChildrenMethod = "numChildren", $rootCall = true, $numChildrenMethod = "numChildren", $rootCall = true,
$nodeCountThreshold = null, $nodeCountCallback = null) { $nodeCountThreshold = null, $nodeCountCallback = null) {
@ -170,10 +170,6 @@ class Hierarchy extends DataExtension {
} else { } else {
$output .= eval("return $titleEval;"); $output .= eval("return $titleEval;");
} }
$output = trim($output);
if (substr($output, -5) == '</li>') {
$output = trim(substr($output, 0, -5));
}
$output .= "\n"; $output .= "\n";
$numChildren = $child->$numChildrenMethod(); $numChildren = $child->$numChildrenMethod();