Skip to content

Commit c48d359

Browse files
committed
[FIX] Resources tree.
1 parent 7d8e446 commit c48d359

1 file changed

Lines changed: 14 additions & 5 deletions

File tree

core/functions/nodes.php

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ function makeHTML($indent, $parent, $expandAll, $hereid = '')
8080
if ($_SESSION['tree_sortby'] === 'isfolder') {
8181
$result = $result->orderBy('menuindex', 'ASC')->orderBy('pagetitle', 'ASC');
8282
}
83-
// orderBy('menuindex', 'ASC')->orderBy('pagetitle', 'ASC');
83+
// orderBy('menuindex', 'ASC')->orderBy('pagetitle', 'ASC');
8484
//'privatemgr',\DB::raw('MAX(IF(1='.$mgrRole.' OR privatemgr=0 '.$docgrp_cond.', 1, 0)) AS hasAccess'),
8585
if (!$showProtected) {
8686
if (!$docgrp) {
@@ -118,6 +118,7 @@ function makeHTML($indent, $parent, $expandAll, $hereid = '')
118118
foreach ($result as $item) {
119119
$row = $item->toArray();
120120
$row['roles'] = '';
121+
$row['nomove'] = 0;
121122
$row['hasAccess'] = 0;
122123
if ($mgrRole == 1 || $row['privatemgr'] == 0) {
123124
$row['hasAccess'] = 1;
@@ -241,7 +242,8 @@ function makeHTML($indent, $parent, $expandAll, $hereid = '')
241242
'subMenuState' => '',
242243
'level' => $level,
243244
'isPrivate' => 0,
244-
'roles' => ($row['roles'] ? $row['roles'] : '')
245+
'roles' => ($row['roles'] ? $row['roles'] : ''),
246+
'nomove' => 0
245247
);
246248

247249
$ph = $data;
@@ -253,16 +255,20 @@ function makeHTML($indent, $parent, $expandAll, $hereid = '')
253255
if (!$row['isfolder']) {
254256
$tpl = getTplSingleNode();
255257
switch ($row['id']) {
256-
case $modx->getConfig('site_start') :
258+
case $modx->getConfig('site_start') :
259+
$ph['nomove'] = 1;
257260
$icon = '<i class="' . $_style['icon_home'] . '"></i>';
258261
break;
259-
case $modx->getConfig('error_page') :
262+
case $modx->getConfig('error_page') :
263+
$ph['nomove'] = 1;
260264
$icon = '<i class="' . $_style['icon_info_triangle'] . '"></i>';
261265
break;
262266
case $modx->getConfig('site_unavailable_page') :
267+
$ph['nomove'] = 1;
263268
$icon = '<i class="' . $_style['icon_clock'] . '"></i>';
264269
break;
265-
case $modx->getConfig('unauthorized_page') :
270+
case $modx->getConfig('unauthorized_page') :
271+
$ph['nomove'] = 1;
266272
$icon = '<i class="' . $_style['icon_info'] . '"></i>';
267273
break;
268274
default:
@@ -658,6 +664,7 @@ function getTplSingleNode()
658664
data-href="[+url+]"
659665
data-private="[+isPrivate+]"
660666
data-roles="[+roles+]"
667+
data-nomove="[+nomove+]"
661668
data-level="[+level+]"
662669
data-treepageclick="[+tree_page_click+]"
663670
[+contextmenu+]
@@ -688,6 +695,7 @@ function getTplFolderNode()
688695
data-href="[+url+]"
689696
data-private="[+isPrivate+]"
690697
data-roles="[+roles+]"
698+
data-nomove="[+nomove+]"
691699
data-level="[+level+]"
692700
data-icon-expanded="[+tree_plusnode+]"
693701
data-icon-collapsed="[+tree_minusnode+]"
@@ -729,6 +737,7 @@ function getTplFolderNodeNotChildren()
729737
data-href="[+url+]"
730738
data-private="[+isPrivate+]"
731739
data-roles="[+roles+]"
740+
data-nomove="[+nomove+]"
732741
data-level="[+level+]"
733742
data-icon-expanded="[+tree_plusnode+]"
734743
data-icon-collapsed="[+tree_minusnode+]"

0 commit comments

Comments
 (0)