From 1cc9d33efc74201bbdf676f389cff4f42dcb1d33 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 7 Feb 2023 16:55:04 +0800
Subject: [PATCH] * Code for finish task #83722.

---
 module/admin/lang/menu.php           |  5 ++++-
 module/admin/model.php               |  2 +-
 module/custom/lang/de.php            |  1 +
 module/custom/lang/en.php            |  1 +
 module/custom/lang/fr.php            |  1 +
 module/custom/lang/zh-cn.php         | 33 +++++++++++++++-------------
 module/custom/view/required.html.php |  4 ++--
 module/custom/view/sidebar.html.php  | 22 +++++++++++++++++++
 8 files changed, 50 insertions(+), 19 deletions(-)
 create mode 100644 module/custom/view/sidebar.html.php

diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index 66e64fb929..72343eb1b5 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -95,7 +95,10 @@ $lang->admin->menuList->feature['tabMenu']['my']['todo']  = array('link' => "{$l
 $lang->admin->menuList->feature['tabMenu']['my']['block'] = array('link' => "{$lang->block->common}|custom|set|module=block&field=closed");
 if($config->vision == 'lite') $lang->admin->menuList->feature['tabMenu']['my']['task'] = array('link' => "{$lang->task->common}|custom|required|module=task", 'links' => array('custom|set|module=task&field=priList'));
 
-$lang->admin->menuList->feature['tabMenu']['product']['product'] = array('link' => "{$lang->productCommon}|custom|required|module=product", 'links' => array("custom|browsestoryconcept|", 'custom|product|'), 'alias' => 'browsestoryconcept');
+$lang->admin->menuList->feature['tabMenu']['product']['product']     = array('link' => "{$lang->productCommon}|custom|required|module=product", 'links' => array("custom|browsestoryconcept|", 'custom|product|'), 'alias' => 'browsestoryconcept');
+$lang->admin->menuList->feature['tabMenu']['product']['story']       = array('link' => "{$lang->productCommon}|custom|required|module=story", 'links' => array("custom|set|module=story&field=categoryList"));
+$lang->admin->menuList->feature['tabMenu']['product']['productplan'] = array('link' => "{$lang->productCommon}|custom|required|module=productplan");
+$lang->admin->menuList->feature['tabMenu']['product']['release']     = array('link' => "{$lang->productCommon}|custom|required|module=release");
 
 $lang->admin->menuList->feature['menuOrder']['5']  = 'my';
 $lang->admin->menuList->feature['menuOrder']['10'] = 'product';
diff --git a/module/admin/model.php b/module/admin/model.php
index 6a60d0b185..5993053e55 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -277,7 +277,7 @@ class adminModel extends model
                 if($moduleName == 'custom' and strpos(',required,set,', $methodName) !== false)
                 {
                     if(strpos(',todo,block,', $paramName) !== false) $subMenuKey = 'my';
-                    if(strpos(',product,', $paramName) !== false) $subMenuKey = 'product';
+                    if(strpos(',product,story,productplan,release,', $paramName) !== false) $subMenuKey = 'product';
                     if($this->config->vision == 'lite' and $paramName == 'task') $subMenuKey = 'my';
                     if(isset($subMenuKey)) $this->lang->admin->menuList->$menuKey['subMenu'][$subMenuKey]['subModule'] = $moduleName;
                 }
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index 632ae18f7e..33b8a0d960 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -137,6 +137,7 @@ $lang->custom->product->fields['browsestoryconcept'] = 'Story Concpet';
 $lang->custom->product->fields['product']            = 'Close Setting';
 
 $lang->custom->story = new stdClass();
+$lang->custom->story->fields['required']         = $lang->custom->required;
 $lang->custom->story->fields['categoryList']     = 'Category';
 $lang->custom->story->fields['priList']          = 'Priority';
 $lang->custom->story->fields['sourceList']       = 'Source';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 21033e27a7..f7db46d43c 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -137,6 +137,7 @@ $lang->custom->product->fields['browsestoryconcept'] = 'Story Concpet';
 $lang->custom->product->fields['product']            = 'Close Setting';
 
 $lang->custom->story = new stdClass();
+$lang->custom->story->fields['required']         = $lang->custom->required;
 $lang->custom->story->fields['categoryList']     = 'Category';
 $lang->custom->story->fields['priList']          = 'Priority';
 $lang->custom->story->fields['sourceList']       = 'Source';
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index 001c6a7964..d192f64313 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -137,6 +137,7 @@ $lang->custom->product->fields['browsestoryconcept'] = 'Story Concpet';
 $lang->custom->product->fields['product']            = 'Close Setting';
 
 $lang->custom->story = new stdClass();
+$lang->custom->story->fields['required']         = $lang->custom->required;
 $lang->custom->story->fields['categoryList']     = 'Category';
 $lang->custom->story->fields['priList']          = 'Priorité';
 $lang->custom->story->fields['sourceList']       = 'Source';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index 5fc9cf8c5e..53648d2072 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -89,21 +89,23 @@ $lang->custom->closedExecution = '已关闭' . $lang->custom->execution;
 $lang->custom->closedKanban    = '已关闭' . $lang->custom->kanban;
 $lang->custom->closedProduct   = '已关闭' . $lang->productCommon;
 
-$lang->custom->object['project']   = '项目';
-$lang->custom->object['product']   = $lang->productCommon;
-$lang->custom->object['execution'] = $lang->custom->execution;
-$lang->custom->object['kanban']    = $lang->custom->kanban;
-$lang->custom->object['story']     = $lang->SRCommon;
-$lang->custom->object['task']      = '任务';
-$lang->custom->object['bug']       = 'Bug';
-$lang->custom->object['testcase']  = '用例';
-$lang->custom->object['testtask']  = '测试单';
-$lang->custom->object['todo']      = '待办';
-$lang->custom->object['user']      = '用户';
-$lang->custom->object['block']     = '区块';
-$lang->custom->object['flow']      = '流程';
-$lang->custom->object['score']     = '积分';
-$lang->custom->object['mode']      = '模式';
+$lang->custom->object['project']     = '项目';
+$lang->custom->object['product']     = $lang->productCommon;
+$lang->custom->object['execution']   = $lang->custom->execution;
+$lang->custom->object['kanban']      = $lang->custom->kanban;
+$lang->custom->object['story']       = $lang->SRCommon;
+$lang->custom->object['task']        = '任务';
+$lang->custom->object['bug']         = 'Bug';
+$lang->custom->object['testcase']    = '用例';
+$lang->custom->object['testtask']    = '测试单';
+$lang->custom->object['todo']        = '待办';
+$lang->custom->object['user']        = '用户';
+$lang->custom->object['block']       = '区块';
+$lang->custom->object['flow']        = '流程';
+$lang->custom->object['score']       = '积分';
+$lang->custom->object['mode']        = '模式';
+$lang->custom->object['productplan'] = '计划';
+$lang->custom->object['release']     = '发布';
 
 $lang->custom->menuOrder[5]  = 'project';
 $lang->custom->menuOrder[10] = 'product';
@@ -137,6 +139,7 @@ $lang->custom->product->fields['browsestoryconcept'] = '需求概念';
 $lang->custom->product->fields['product']            = '关闭设置';
 
 $lang->custom->story = new stdClass();
+$lang->custom->story->fields['required']         = $lang->custom->required;
 $lang->custom->story->fields['categoryList']     = '类型';
 $lang->custom->story->fields['priList']          = '优先级';
 $lang->custom->story->fields['sourceList']       = '来源';
diff --git a/module/custom/view/required.html.php b/module/custom/view/required.html.php
index a07c5d7f93..47e69cdca3 100644
--- a/module/custom/view/required.html.php
+++ b/module/custom/view/required.html.php
@@ -12,12 +12,12 @@
 ?>
 <?php include 'header.html.php';?>
 <div id='mainContent' class='main-row'>
-  <?php include 'sidebar.html.php';?>
+  <?php if(!in_array($module, array('productplan', 'release'))) include 'sidebar.html.php';?>
   <div class='main-col main-content'>
     <form class="load-indicator main-form form-ajax" method='post'>
       <div class='main-header'>
         <div class='heading'>
-          <strong><?php echo $lang->custom->object[$module] . $lang->arrow . $lang->custom->$module->fields['required']?></strong>
+          <strong><?php echo $lang->custom->object[$module] . $lang->arrow . $lang->custom->required;?></strong>
         </div>
       </div>
       <table class='table table-form mw-800px'>
diff --git a/module/custom/view/sidebar.html.php b/module/custom/view/sidebar.html.php
new file mode 100644
index 0000000000..0dc0568b74
--- /dev/null
+++ b/module/custom/view/sidebar.html.php
@@ -0,0 +1,22 @@
+<div class='side-col' id='sidebar'>
+  <div class='cell'>
+    <div class='list-group tab-menu'>
+      <?php
+      foreach($lang->custom->{$module}->fields as $key => $value)
+      {
+          $params = $key == 'required' ? "module=$module" : '';
+          $method = $key;
+          $active = $app->rawMethod == $key ? 'active' : '';
+          if(!in_array($key, $config->custom->notSetMethods))
+          {
+              $params = "module=$module&field=$key";
+              $method = 'set';
+              $active = (isset($field) and $field == $key) ? 'active' : $active;
+          }
+
+          if(common::hasPriv('custom', $method)) echo html::a(inlink($method, $params), $value, '', "class='$active'");
+      }
+      ?>
+    </div>
+  </div>
+</div>