Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #15592.

Browse Source
This commit is contained in:
liyuchun
2021-10-20 16:04:44 +08:00
parent a3948383f8
commit fce0f3aafa
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+2 -2
View File
@@ -78,8 +78,8 @@ class docModel extends model
{
$stmt = $this->dao->select('*')->from(TABLE_DOCLIB)
->where('deleted')->eq(0)
->beginIF($type and $type != 'api')->andWhere('type')->eq($type)->fi()
->andWhere('type')->ne('api')
->beginIF($type)->andWhere('type')->eq($type)->fi()
->beginIF(!$type)->andWhere('type')->ne('api')->fi()
->orderBy('`order`, id desc')->query();
}
module/tree/view/browse.html.php
+15 -2
View File
@@ -32,6 +32,19 @@ $childTitle = $lang->tree->child;
if(strpos($viewType, 'feedback') !== false) $childTitle = $lang->tree->subCategory;
if(strpos($viewType, 'doc') !== false or $viewType == 'api') $childTitle = $lang->doc->childType;
if($viewType == 'line' or $viewType == 'trainskill' or $viewType == 'trainpost') $childTitle = '';
$editTitle = $lang->tree->edit;
$deleteTitle = $lang->tree->delete;
if($viewType == 'feedback')
{
$editTitle = $lang->tree->editCategory;
$deleteTitle = $lang->tree->delCategory;
}
if($viewType == 'doc' or $viewType == 'api')
{
$editTitle = $lang->doc->editType;
$deleteTitle = $lang->doc->deleteType;
}
?>
<!--div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
@@ -224,13 +237,13 @@ $(function()
edit:
{
linkTemplate: '<?php echo helper::createLink('tree', 'edit', "moduleID={0}&type=$viewType"); ?>',
title: '<?php echo $viewType == 'doc' ? $lang->doc->editType : ($viewType == 'feedback' ? $lang->tree->editCategory : $lang->tree->edit);?>',
title: '<?php echo $editTitle;?>',
template: '<a><i class="icon-edit"></i></a>'
},
"delete":
{
linkTemplate: '<?php echo helper::createLink('tree', 'delete', "rootID=$rootID&moduleID={0}"); ?>',
title: '<?php echo $viewType == 'doc' ? $lang->doc->deleteType : ($viewType == 'feedback' ? $lang->tree->delCategory : $lang->tree->delete)?>',
title: '<?php echo $deleteTitle;?>',
template: '<a><i class="icon-trash"></i></a>'
},
subModules: