From 10f320c56c210bfcf2273498e13dc85910334cdc Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Wed, 28 Nov 2018 17:24:50 +0800
Subject: [PATCH] * Fix feedback bug.

---
 module/tree/lang/zh-cn.php       | 2 +-
 module/tree/view/browse.html.php | 4 +++-
 module/tree/view/edit.html.php   | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php
index da93f1d551..9f7eb69d9b 100644
--- a/module/tree/lang/zh-cn.php
+++ b/module/tree/lang/zh-cn.php
@@ -12,7 +12,7 @@
 $lang->tree = new stdclass();
 $lang->tree->common             = '模块维护';
 $lang->tree->edit               = '编辑';
-$lang->tree->delete             = '删除模块';
+$lang->tree->delete             = '删除';
 $lang->tree->browse             = '通用模块维护';
 $lang->tree->browseTask         = '任务模块维护';
 $lang->tree->manage             = '维护模块';
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index f29186bf83..2b9c0fe1ab 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -12,8 +12,10 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('viewType', $viewType);?>
+<?php $this->app->loadLang('doc');?>
 <?php $hasBranch = (strpos('story|bug|case', $viewType) !== false and (!empty($root->type) && $root->type != 'normal')) ? true : false;?>
 <?php $name = $viewType == 'line' ? $lang->tree->line : (($viewType == 'doc' or $viewType == 'feedback') ? $lang->tree->cate : $lang->tree->name);?>
+<?php $title = $viewType == 'line' ? '' : ((strpos($viewType, 'doc') !== false || strpos($viewType, 'feedback') !== false) ? $lang->doc->childType : $lang->tree->child);?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php $backLink = $this->session->{$viewType . 'List'} ? $this->session->{$viewType . 'List'} : 'javascript:history.go(-1)';?>
@@ -209,7 +211,7 @@ $(function()
             subModules:
             {
                 linkTemplate: '<?php echo helper::createLink('tree', 'browse', "rootID=$rootID&viewType=$viewType&moduleID={0}&branch={1}"); ?>',
-                title: '<?php echo $viewType == 'line' ? '' : (strpos($viewType, 'doc') !== false ? $lang->doc->childType : $lang->tree->child) ?>',
+                title: '<?php echo $title;?>',
                 template: '<a><?php echo $viewType == 'line' ? '' : '<i class="icon-treemap-alt"></i>';?></a>',
             }
         },
diff --git a/module/tree/view/edit.html.php b/module/tree/view/edit.html.php
index 9d656920ea..1bcd06b5c1 100644
--- a/module/tree/view/edit.html.php
+++ b/module/tree/view/edit.html.php
@@ -39,12 +39,12 @@ js::set('type', $type);
         <?php endif;?>
         <?php if($module->type != 'line'):?>
         <tr <?php if($hidden) echo "style='display:none'";?>>
-          <th class='w-80px'><?php echo $type == 'doc' ? $lang->tree->parentCate : $lang->tree->parent;?></th>
+          <th class='w-80px'><?php echo ($type == 'doc' || $type == 'feedback') ? $lang->tree->parentCate : $lang->tree->parent;?></th>
           <td><?php echo html::select('parent', $optionMenu, $module->parent, "class='form-control chosen'");?></td>
         </tr>
         <?php endif;?>
         <tr <?php if($hidden) echo "style='display:none'";?>>
-          <th class='w-80px'><?php echo $type == 'doc' ? $lang->tree->cate : $lang->tree->name;?></th>
+          <th class='w-80px'><?php echo ($type == 'doc' || $type == 'feedback') ? $lang->tree->cate : $lang->tree->name;?></th>
           <td><?php echo html::input('name', $module->name, "class='form-control' autocomplete='off'");?></td>
         </tr>
         <?php if($type == 'bug'):?>