diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 3fcc453cb9..6af3843448 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -280,7 +280,7 @@ $lang->block->typeList->story['closedBy'] = 'Closed by Me' ; $lang->block->typeList->product['noclosed'] = 'Open'; $lang->block->typeList->product['closed'] = 'Closed'; $lang->block->typeList->product['all'] = 'All'; -$lang->block->typeList->product['involved'] = 'Involved' +$lang->block->typeList->product['involved'] = 'Involved'; $lang->block->typeList->project['undone'] = 'Undone'; $lang->block->typeList->project['isdoing'] = 'Doing'; diff --git a/module/doc/model.php b/module/doc/model.php index 5552ed246f..9345c10628 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -1031,6 +1031,7 @@ class docModel extends model $node->type = 'module'; $docs = isset($docGroups[$node->id]) ? $docGroups[$node->id] : array(); + $menu = !empty($node->children) ? $node->children : array(); if(!empty($docs)) { $docItems = array(); @@ -1047,13 +1048,17 @@ class docModel extends model if(common::hasPriv('doc', 'delete'))$buttons .= html::a(helper::createLink('doc', 'delete', "docID=$doc->id"), "", 'hiddenwin', "class='btn-icon' title='{$this->lang->doc->delete}'"); $docItem->buttons = $buttons; $docItem->actions = false; - $docItems[] = $docItem; + $docItems[] = $docItem; } - $node->docsCount = count($docItems); - $node->children = $docItems; + + /* Reorder children. The doc is top of menu. */ + if($menu) $docItems = array_merge($docItems, $menu); + + $node->children = $docItems; } - $node->actions = false; + $node->docsCount = isset($node->children) ? count($node->children) : 0; + $node->actions = false; return $node; }