From 6582a700bb29424464f1f337fb04e141fdb2e071 Mon Sep 17 00:00:00 2001
From: zhujinyong <vimrus.com@gmail.com>
Date: Sun, 21 Mar 2021 16:11:07 +0800
Subject: [PATCH] * Fix story of project.

---
 framework/control.class.php            |  2 +-
 module/admin/view/safe.html.php        |  2 +-
 module/backup/view/index.html.php      |  2 +-
 module/common/lang/common.php          |  1 +
 module/common/lang/menu.php            | 41 +++++++++++---------------
 module/common/lang/zh-cn.php           |  5 ++--
 module/common/model.php                |  2 --
 module/cron/view/index.html.php        |  2 +-
 module/custom/model.php                |  3 +-
 module/custom/view/timezone.html.php   |  2 +-
 module/dev/view/header.html.php        |  2 +-
 module/message/view/header.html.php    |  2 +-
 module/product/control.php             |  8 +++--
 module/product/view/browse.html.php    |  5 ++--
 module/projectstory/control.php        |  5 ++--
 module/search/view/buildindex.html.php |  2 +-
 module/setting/model.php               |  1 +
 module/story/control.php               |  4 +++
 module/webhook/view/header.html.php    |  2 +-
 19 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/framework/control.class.php b/framework/control.class.php
index b8dd49f08b..c3521f7c82 100644
--- a/framework/control.class.php
+++ b/framework/control.class.php
@@ -208,7 +208,7 @@ class control extends baseControl
         chdir(dirname($viewFile));
 
         /**
-         * 使用extract安定ob方法渲染$viewFile里面的代码。
+         * 使用extract和ob方法渲染$viewFile里面的代码。
          * Use extract and ob functions to eval the codes in $viewFile.
          */
         extract((array)$this->view);
diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php
index 738fb25ca6..2868a02f65 100644
--- a/module/admin/view/safe.html.php
+++ b/module/admin/view/safe.html.php
@@ -14,7 +14,7 @@
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <!--div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div-->
+    <div class='btn-toolbar pull-left'><?php // common::printAdminSubMenu('system');?></div>
   </div>
 </div>
 <div class="main-row">
diff --git a/module/backup/view/index.html.php b/module/backup/view/index.html.php
index 9d61e02d1c..374ec2ef8c 100644
--- a/module/backup/view/index.html.php
+++ b/module/backup/view/index.html.php
@@ -17,7 +17,7 @@
 </div>
 <?php endif;?>
 <div id='mainMenu' class='clearfix'>
-  <!--div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div-->
+  <div class='btn-toolbar pull-left'><?php // common::printAdminSubMenu('system');?></div>
 </div>
 <div id='mainContent' class="main-row">
   <div class='side-col' id='sidebar'>
diff --git a/module/common/lang/common.php b/module/common/lang/common.php
index 9545a35527..da2c1165df 100644
--- a/module/common/lang/common.php
+++ b/module/common/lang/common.php
@@ -61,6 +61,7 @@ $lang->devops      = new stdclass();
 $lang->team        = new stdclass();
 $lang->automation  = new stdclass();
 $lang->personnel   = new stdclass();
+$lang->mail        = new stdclass();
 
 $lang->projectrelease = new stdclass();
 $lang->projectstory   = new stdclass();
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 113640720b..fb9ad14a91 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -34,11 +34,9 @@ $lang->mainNav->menuOrder[60] = 'system';
 $lang->mainNav->menuOrder[70] = 'admin';
 
 /* My menu. */
-$lang->my = new stdclass();
 $lang->my->menu = new stdclass();
-
 $lang->my->menu->index      = array('link' => "$lang->dashboard|my|index");
-$lang->my->menu->work       = array('link' => "$lang->todo|my|work|mode=task");
+$lang->my->menu->work       = array('link' => "{$lang->my->work}|my|work|mode=task");
 if($config->systemMode == 'new') $lang->my->menu->project = array('link' => "{$lang->project->common}|my|project|");
 $lang->my->menu->execution  = array('link' => "{$lang->execution->common}|my|execution|type=undone");
 $lang->my->menu->contribute = array('link' => "$lang->contribute|my|contribute|mode=task");
@@ -281,6 +279,11 @@ $lang->execution->menu->qa['subMenu']->testcase   = array('link' => "{$lang->tes
 $lang->execution->menu->qa['subMenu']->testtask   = array('link' => "{$lang->testtask->common}|execution|testtask|executionID=%s");
 // $lang->execution->menu->qa['subMenu']->testreport = array('link' => "$lang->project->report|testreport|browse|exeutionID=%s&type=execution");
 
+$lang->execution->menu->qa['menuOrder'][5]  = 'qa';
+$lang->execution->menu->qa['menuOrder'][10] = 'bug';
+$lang->execution->menu->qa['menuOrder'][15] = 'testcase';
+$lang->execution->menu->qa['menuOrder'][20] = 'testtask';
+
 $lang->execution->menu->settings['subMenu'] = new stdclass();
 $lang->execution->menu->settings['subMenu']->view      = array('link' => "$lang->overview|execution|view|executionID=%s", 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
 $lang->execution->menu->settings['subMenu']->products  = array('link' => "$lang->productCommon|execution|manageproducts|executionID=%s");
@@ -388,7 +391,7 @@ $lang->admin->menu->custom    = array('link' => "{$lang->custom->common}|custom|
 $lang->admin->menu->extension = array('link' => "{$lang->extension->common}|extension|browse", 'subModule' => 'extension');
 $lang->admin->menu->dev       = array('link' => "$lang->redev|dev|api", 'alias' => 'db', 'subModule' => 'dev,editor,entry');
 $lang->admin->menu->message   = array('link' => "{$lang->message->common}|message|index", 'subModule' => 'message,mail,webhook');
-$lang->admin->menu->system    = array('link' => "{$lang->admin->system}|backup|index", 'subModule' => 'cron,backup,action,search');
+$lang->admin->menu->system    = array('link' => "{$lang->admin->system}|backup|index", 'subModule' => 'cron,backup,action,search,admin');
 
 /* Admin menu order. */
 $lang->admin->menuOrder[5]  = 'index';
@@ -400,37 +403,29 @@ $lang->admin->menuOrder[30] = 'extension';
 $lang->admin->menuOrder[35] = 'dev';
 $lang->admin->menuOrder[40] = 'system';
 
-/*
-$lang->admin->subMenuOrder = new stdclass();
-$lang->admin->subMenuOrder->message[5]  = 'mail';
-$lang->admin->subMenuOrder->message[10] = 'webhook';
-$lang->admin->subMenuOrder->message[15] = 'browser';
-$lang->admin->subMenuOrder->message[20] = 'setting';
-$lang->admin->subMenuOrder->sso[5]      = 'ranzhi';
-$lang->admin->subMenuOrder->dev[5]      = 'api';
-$lang->admin->subMenuOrder->dev[10]     = 'db';
-$lang->admin->subMenuOrder->dev[15]     = 'editor';
-$lang->admin->subMenuOrder->dev[20]     = 'entry';
-$lang->admin->subMenuOrder->system[5]   = 'data';
-$lang->admin->subMenuOrder->system[10]  = 'safe';
-$lang->admin->subMenuOrder->system[15]  = 'cron';
-$lang->admin->subMenuOrder->system[20]  = 'timezone';
-$lang->admin->subMenuOrder->system[25]  = 'buildIndex';
- */
-
 $lang->admin->menu->message['subMenu'] = new stdclass();
 $lang->admin->menu->message['subMenu']->message = new stdclass();
-$lang->admin->menu->message['subMenu']->mail    = array('link' => "$lang->mail|mail|index", 'subModule' => 'mail');
+$lang->admin->menu->message['subMenu']->mail    = array('link' => "{$lang->mail->common}|mail|index", 'subModule' => 'mail');
 $lang->admin->menu->message['subMenu']->webhook = array('link' => "Webhook|webhook|browse", 'subModule' => 'webhook');
 $lang->admin->menu->message['subMenu']->browser = array('link' => "$lang->browser|message|browser");
 $lang->admin->menu->message['subMenu']->setting = array('link' => "$lang->settings|message|setting");
 
+$lang->admin->menu->message['menuOrder'][5]  = 'mail';
+$lang->admin->menu->message['menuOrder'][10] = 'webhook';
+$lang->admin->menu->message['menuOrder'][15] = 'browser';
+$lang->admin->menu->message['menuOrder'][20] = 'setting';
+
 $lang->admin->menu->dev['subMenu'] = new stdclass();
 $lang->admin->menu->dev['subMenu']->api    = array('link' => "API|dev|api");
 $lang->admin->menu->dev['subMenu']->db     = array('link' => "$lang->db|dev|db");
 $lang->admin->menu->dev['subMenu']->editor = array('link' => "$lang->editor|dev|editor");
 $lang->admin->menu->dev['subMenu']->entry  = array('link' => "{$lang->admin->entry}|entry|browse", 'subModule' => 'entry');
 
+$lang->admin->menu->dev['menuOrder'][5]  = 'api';
+$lang->admin->menu->dev['menuOrder'][10] = 'db';
+$lang->admin->menu->dev['menuOrder'][15] = 'editor';
+$lang->admin->menu->dev['menuOrder'][20] = 'entry';
+
 $lang->admin->menu->system['subMenu'] = new stdclass();
 $lang->admin->menu->system['subMenu']->data       = array('link' => "{$lang->admin->data}|backup|index", 'subModule' => 'action');
 $lang->admin->menu->system['subMenu']->safe       = array('link' => "$lang->safety|admin|safe", 'alias' => 'checkweak');
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index b44ee8c0c2..548305d886 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -161,6 +161,7 @@ $lang->personnel->accessible = '可访问人员';
 $lang->stakeholder->common = '干系人';
 $lang->release->common     = '发布';
 $lang->message->common     = '通知';
+$lang->mail->common        = '邮件';
 
 $lang->my->shortCommon          = '地盘';
 $lang->testcase->shortCommon    = '用例';
@@ -170,7 +171,6 @@ $lang->testreport->shortCommon  = '报告';
 $lang->qa->shortCommon          = 'QA';
 
 $lang->dashboard  = '仪表盘';
-$lang->todo       = '待处理';
 $lang->contribute = '贡献';
 $lang->dynamic    = '动态';
 $lang->contact    = '联系人';
@@ -197,7 +197,6 @@ $lang->intro      = '介绍';
 $lang->indexPage  = '首页';
 $lang->model      = '模型';
 $lang->redev      = '二次开发';
-$lang->mail       = '邮件';
 $lang->browser    = '浏览器';
 $lang->db         = '数据库';
 $lang->editor     = '编辑器';
@@ -205,6 +204,8 @@ $lang->timezone   = '时区';
 $lang->safety     = '安全';
 $lang->calendar   = '日程';
 
+$lang->my->work = '待处理';
+
 $lang->project->report = '报告';
 
 $lang->report->weekly = '周报';
diff --git a/module/common/model.php b/module/common/model.php
index 4be1a464e5..8d628ad3d8 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -788,8 +788,6 @@ class commonModel extends model
 
         $openApp = $app->openApp;
 
-        if(in_array($moduleName, array('admin', 'repo', 'ops', 'feedback'))) return;
-
         self::getModuleMenu($activeMenu);
 
         if(!isset($lang->$openApp->menu))
diff --git a/module/cron/view/index.html.php b/module/cron/view/index.html.php
index 4b048d2af0..aa9993434d 100644
--- a/module/cron/view/index.html.php
+++ b/module/cron/view/index.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
-  <!--div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div-->
+  <div class='btn-toolbar pull-left'><?php // common::printAdminSubMenu('system');?></div>
 </div>
 <div id='mainContent' class='main-content'>
   <?php if(!empty($config->global->cron)):?>
diff --git a/module/custom/model.php b/module/custom/model.php
index 482214fa72..5b6b90528a 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -155,6 +155,7 @@ class customModel extends model
         $menuModuleName = $module;
         $order          = 1;
         $customMenuMap  = array();
+        $openApp        = $app->openApp;
         $isTutorialMode = commonModel::isTutorialMode();
 
         if($customMenu)
@@ -194,7 +195,7 @@ class customModel extends model
         }
         elseif($module)
         {
-            $menuOrder = ($module == 'main' and isset($lang->menuOrder)) ? $lang->menuOrder : (isset($lang->$module->menuOrder) ? $lang->$module->menuOrder : array());
+            $menuOrder = ($module == 'main' and isset($lang->menuOrder)) ? $lang->menuOrder : (isset($lang->menu->$module['menuOrder']) ? $lang->menu->$module['menuOrder'] : array());
             if($menuOrder)
             {
                 ksort($menuOrder);
diff --git a/module/custom/view/timezone.html.php b/module/custom/view/timezone.html.php
index 3c9ba22215..bdbf81e583 100644
--- a/module/custom/view/timezone.html.php
+++ b/module/custom/view/timezone.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
-  <!--div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div-->
+  <div class='btn-toolbar pull-left'><?php // common::printAdminSubMenu('system');?></div>
 </div>
 <div id='mainContent' class='main-content'>
   <div class='mw-500px'>
diff --git a/module/dev/view/header.html.php b/module/dev/view/header.html.php
index 023667c840..10ac21f534 100644
--- a/module/dev/view/header.html.php
+++ b/module/dev/view/header.html.php
@@ -1,5 +1,5 @@
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
-  <div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('dev');?></div>
+  <!--div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('dev');?></div-->
 </div>
 <script>$('#mainMenu #<?php echo $tab;?>').addClass('btn-active-text')</script>
diff --git a/module/message/view/header.html.php b/module/message/view/header.html.php
index c101596db7..1c69b5f855 100644
--- a/module/message/view/header.html.php
+++ b/module/message/view/header.html.php
@@ -1,4 +1,4 @@
 <?php include '../../common/view/header.html.php';?>
 <div id="mainMenu" class="clearfix">
-  <!--div class="btn-toolbar pull-left"><?php common::printAdminSubMenu('message');?></div-->
+  <div class="btn-toolbar pull-left"><?php // common::printAdminSubMenu('message');?></div-->
 </div>
diff --git a/module/product/control.php b/module/product/control.php
index 003fa33b4c..96300a3605 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -115,13 +115,14 @@ class product extends control
      * @param  int    $recTotal
      * @param  int    $recPerPage
      * @param  int    $pageID
-     * @param  string $from product|project
+     * @param  int    $projectID
      * @access public
      * @return void
      */
-    public function browse($productID = 0, $branch = 0, $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1, $from = 'product')
+    public function browse($productID = 0, $branch = 0, $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1, $projectID = 0)
     {
-        $this->product->setMenu($productID, $branch);
+        if($this->app->openApp == 'product') $this->product->setMenu($productID, $branch);
+        if($this->app->openApp == 'project') $this->loadModel('project')->setMenu($projectID);
 
         /* Lower browse type. */
         $browseType = strtolower($browseType);
@@ -289,6 +290,7 @@ class product extends control
         $this->view->storyBugs       = $storyBugs;
         $this->view->storyCases      = $storyCases;
         $this->view->param           = $param;
+        $this->view->projectID       = $projectID;
         $this->view->products        = $this->products;
         $this->view->projectProducts = isset($projectProducts) ? $projectProducts : array();
         $this->view->storyType       = $storyType;
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 1029d149d1..775633e480 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -135,18 +135,17 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
       <ul class='dropdown-menu'>
         <li>
         <?php
-        $openApp = $isProjectStory ? 'project' : 'product';
         if(commonModel::isTutorialMode())
         {
             $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID");
-            if($isProjectStory) $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID&storyID=&projectID={$this->session->PRJ}");
+            if($isProjectStory) $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID&storyID=&projectID=$projectID");
             $link = $this->createLink('tutorial', 'wizard', "module=story&method=create&params=$wizardParams");
             echo html::a($link, $lang->story->createCommon, '', "data-group='$openApp'");
         }
         else
         {
             $link     = $this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID=0&bugID=0&planID=0&todoID=0&extra=&type=$storyType");
-            if($isProjectStory) $link = $this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID={$this->session->PRJ}");
+            if($isProjectStory) $link = $this->createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID=$projectID");
             $disabled = '';
             if(!common::hasPriv('story', 'create'))
             {
diff --git a/module/projectstory/control.php b/module/projectstory/control.php
index 70d48c6224..8443347244 100644
--- a/module/projectstory/control.php
+++ b/module/projectstory/control.php
@@ -30,6 +30,7 @@ class projectStory extends control
     /**
      * Get software requirements from product.
      *
+     * @param  int    $projectID
      * @param  int    $productID
      * @param  int    $branch
      * @param  string $browseType
@@ -42,11 +43,11 @@ class projectStory extends control
      * @access public
      * @return void
      */
-    public function story($productID = 0, $branch = 0, $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function story($projectID = 0, $productID = 0, $branch = 0, $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $this->session->set('storyList', $this->app->getURI(true), 'project');
 
-        echo $this->fetch('product', 'browse', "productID=$productID&branch=$branch&browseType=$browseType&param=$param&storyType=$storyType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID&from=project");
+        echo $this->fetch('product', 'browse', "productID=$productID&branch=$branch&browseType=$browseType&param=$param&storyType=$storyType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID&projectID=$projectID");
     }
 
     /**
diff --git a/module/search/view/buildindex.html.php b/module/search/view/buildindex.html.php
index 9b1b16005e..817aad8b34 100644
--- a/module/search/view/buildindex.html.php
+++ b/module/search/view/buildindex.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
-  <!--div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div-->
+  <div class='btn-toolbar pull-left'><?php // common::printAdminSubMenu('system');?></div>
 </div>
 <div id='mainContent' class='main-content'>
   <div class='main-header'>
diff --git a/module/setting/model.php b/module/setting/model.php
index 00b9f0a0aa..46d5989b45 100644
--- a/module/setting/model.php
+++ b/module/setting/model.php
@@ -179,6 +179,7 @@ class settingModel extends model
         $config = array();
         foreach($records as $record)
         {
+            if(!isset($config[$record->owner])) $config[$record->owner] = new stdclass();
             if(!isset($record->module)) return array();    // If no module field, return directly. Since 3.2 version, there's the module field.
             if(empty($record->module)) continue;
 
diff --git a/module/story/control.php b/module/story/control.php
index e81401e4d8..75804d3cb3 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -53,6 +53,10 @@ class story extends control
         {
             $this->loadModel('product')->setMenu($productID);
         }
+        else if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($objectID);
+        }
 
         /* Whether there is a object to transfer story, for example feedback. */
         $extra = str_replace(array(',', ' '), array('&', ''), $extra);
diff --git a/module/webhook/view/header.html.php b/module/webhook/view/header.html.php
index c1fcfcba66..9197f7e5c3 100644
--- a/module/webhook/view/header.html.php
+++ b/module/webhook/view/header.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
-  <!--div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('message');?></div-->
+  <div class='btn-toolbar pull-left'><?php // common::printAdminSubMenu('message');?></div>
   <div class='btn-toolbar pull-right'>
     <div class='btn-group'>
       <div class='btn-group' id='createActionMenu'>