- rm treeview.html.php.

module/bug/view/browse.html.php

@@ -12,7 +12,6 @@
 ?>
 <?php
 include '../../common/view/header.html.php';
-include '../../common/view/treeview.html.php';
 js::set('browseType', $browseType);
 js::set('moduleID', $moduleID);
 ?>

module/common/view/treeview.html.php

@@ -1,2 +0,0 @@
-<?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<?php

module/company/view/browse.html.php

@@ -12,7 +12,6 @@
 ?>
 <?php 
 include '../../common/view/header.html.php';
-include '../../common/view/treeview.html.php';
 js::set('deptID', $deptID);
 js::set('confirmDelete', $lang->user->confirmDelete);
 ?>

module/custom/view/flow.html.php

@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <div id='featurebar'>
   <ul class='nav'>
   <?php

module/custom/view/set.html.php

@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <?php 
 $itemRow = <<<EOT
   <tr class='text-center'>

module/dept/view/browse.html.php

@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <div id='titlebar'>
   <div class='heading'><?php echo html::icon($lang->icons['dept']);?> <?php echo $lang->dept->common;?></div>
 </div>

module/doc/view/browse.html.php

@@ -12,7 +12,6 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <?php js::set('confirmDelete', $lang->doc->confirmDelete)?>
 <script language='Javascript'>
 var browseType = '<?php echo $browseType;?>';

module/editor/view/extend.html.php

@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.lite.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <div class='panel panel-sm'>
   <div class='panel-heading'><i class='icon-list-ul'></i> <strong><?php echo isset($lang->editor->modules[$module])? $lang->editor->modules[$module] : $module;?></strong></div>
   <div class='panel-body'>

module/extension/view/obtain.html.php

@@ -11,7 +11,6 @@
  */
 ?>
 <?php include 'header.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <div class='side'>
   <form class='side-search mgb-20' method='post' action='<?php echo inlink('obtain', 'type=bySearch');?>'>
     <div class="input-group">

module/product/view/browse.html.php

@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <?php js::set('browseType', $browseType);?>
 <div id='featurebar'>
   <ul class='nav'>

module/project/view/story.html.php

@@ -12,7 +12,6 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <?php js::set('confirmUnlinkStory', $lang->project->confirmUnlinkStory)?>
 <div id='titlebar'>
   <div class='heading'><?php echo html::icon($lang->icons['story']);?> <?php echo $lang->project->story;?></div>

module/project/view/task.html.php

@@ -12,7 +12,6 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <?php include './taskheader.html.php';?>
 <?php js::set('moduleID', $moduleID);?>
 <?php js::set('productID', $productID);?>

module/testcase/view/browse.html.php

@@ -13,7 +13,6 @@
 <?php
 include '../../common/view/header.html.php';
 include '../../common/view/datepicker.html.php';
-include '../../common/view/treeview.html.php';
 include './caseheader.html.php';
 js::set('browseType', $browseType);
 js::set('moduleID'  , $moduleID);

module/testtask/view/cases.html.php

@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <?php include './caseheader.html.php';?>
 <?php js::set('confirmUnlink', $lang->testtask->confirmUnlinkCase)?>
 <script language="Javascript">

module/tree/model.php

@@ -604,9 +604,11 @@ class treeModel extends model
         $products = $this->loadModel('product')->getPairs('nocode');
 
         $productModules = $this->getTreeMenu(0, 'productdoc', 0, array('treeModel', 'createDocLink'), 'product');
-        $productModules = substr($productModules, 17, strlen($productModules) - 23);
+        $startPos       = strpos($productModules, '<li');
+        $productModules = substr($productModules, $startPos, strrpos($productModules, '</ul') - $startPos);
         $projectModules = $this->getTreeMenu(0, 'projectdoc', 0, array('treeModel', 'createDocLink'), 'product');
-        $projectModules = substr($projectModules, 17, strlen($projectModules) - 23);
+        $startPos       = strpos($projectModules, '<li');
+        $projectModules = substr($projectModules, $startPos, strrpos($projectModules, '</ul>') - $startPos);
 
         foreach($products as $productID =>$productName)
         {
@@ -646,7 +648,8 @@ class treeModel extends model
         $projects = $this->loadModel('project')->getProductGroupList();
 
         $projectModules = $this->getTreeMenu(0, 'projectdoc', 0, array('treeModel', 'createDocLink'), 'project');
-        $projectModules = substr($projectModules, 17, strlen($projectModules) - 23);
+        $startPos       = strpos($projectModules, '<li');
+        $projectModules = substr($projectModules, $startPos, strrpos($projectModules, '</ul') - $startPos);
 
         foreach($projects as $id => $project)
         {

module/tree/view/browse.html.php

@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <?php $hasBranch = (strpos('story|bug|case', $viewType) !== false and $root->type != 'normal') ? true : false;?>
 <div id='titlebar'>
   <div class='heading'><i class='icon-cogs'></i> <?php echo $lang->tree->common;?>  </div>

module/tree/view/browsetask.html.php

@@ -11,7 +11,6 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php include '../../common/view/treeview.html.php';?>
 <div id='featurebar'>
   <div class='heading'><i class='icon-cogs'></i> <?php echo $lang->tree->common;?>  </div>
 </div>