From f5eee5d43d88f810ea3c2afa1189ffa4b1e17aed Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Wed, 10 Mar 2021 09:11:03 +0800
Subject: [PATCH 01/16] * Finish task #36479.

---
 module/my/js/common.js              | 1 +
 module/my/view/bug.html.php         | 2 ++
 module/my/view/requirement.html.php | 2 ++
 module/my/view/story.html.php       | 2 ++
 module/my/view/task.html.php        | 2 ++
 module/my/view/testcase.html.php    | 2 ++
 module/my/view/testtask.html.php    | 2 ++
 7 files changed, 13 insertions(+)

diff --git a/module/my/js/common.js b/module/my/js/common.js
index 37a1292422..60242230cc 100644
--- a/module/my/js/common.js
+++ b/module/my/js/common.js
@@ -3,6 +3,7 @@ $(function()
     if(typeof mode === 'string')
     {
         $('#subNavbar li[data-id=' + mode + ']').addClass('active');
+        if(typeof rawMethod === 'string' && rawMethod == 'work') $('#subNavbar li[data-id=' + mode + '] a').append('<span class="label label-light label-badge">' + total + '</span>');
     }
     var scp  = $('[data-id="changePassword"] a');
     var sign = config.requestType == 'GET' ? '&' : '?';
diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php
index 2984f29f3e..1e0c6c61ec 100644
--- a/module/my/view/bug.html.php
+++ b/module/my/view/bug.html.php
@@ -12,6 +12,8 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('mode', $mode);?>
+<?php js::set('total', $pager->recTotal);?>
+<?php js::set('rawMethod', $app->rawMethod);?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php
diff --git a/module/my/view/requirement.html.php b/module/my/view/requirement.html.php
index 5b8230ffab..ea933695da 100644
--- a/module/my/view/requirement.html.php
+++ b/module/my/view/requirement.html.php
@@ -12,6 +12,8 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('mode', $mode);?>
+<?php js::set('total', $pager->recTotal);?>
+<?php js::set('rawMethod', $app->rawMethod);?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php
diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index 73f7c0be74..d2c4e02b54 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -12,6 +12,8 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('mode', $mode);?>
+<?php js::set('total', $pager->recTotal);?>
+<?php js::set('rawMethod', $app->rawMethod);?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 7507ddc117..74fbc708dd 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -12,6 +12,8 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('mode', $mode);?>
+<?php js::set('total', $pager->recTotal);?>
+<?php js::set('rawMethod', $app->rawMethod);?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php $recTotalLabel = " <span class='label label-light label-badge'>{$pager->recTotal}</span>"; ?>
diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php
index 8d7e344ef9..b065848a68 100644
--- a/module/my/view/testcase.html.php
+++ b/module/my/view/testcase.html.php
@@ -12,6 +12,8 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('mode', $mode);?>
+<?php js::set('total', $pager->recTotal);?>
+<?php js::set('rawMethod', $app->rawMethod);?>
 <style>
 .w-230px{width:230px;}
 </style>
diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php
index 35697f18d6..0c2a4cf2f9 100644
--- a/module/my/view/testtask.html.php
+++ b/module/my/view/testtask.html.php
@@ -12,6 +12,8 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('mode', $mode);?>
+<?php js::set('total', $pager->recTotal);?>
+<?php js::set('rawMethod', $app->rawMethod);?>
 <?php js::set('confirmDelete', $lang->testtask->confirmDelete)?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">

From 8f294074bb1eb2b7e87ccd4f2752eba776bbbffc Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Wed, 10 Mar 2021 09:12:07 +0800
Subject: [PATCH 02/16]  * Finish task #36496.

---
 module/action/model.php              |  16 ++--
 module/common/lang/zh-cn.php         |   2 +-
 module/project/control.php           |  68 ++++++++++++++
 module/project/css/dynamic.css       |  21 +++++
 module/project/view/dynamic.html.php | 128 +++++++++++++++++++++++++++
 5 files changed, 225 insertions(+), 10 deletions(-)
 create mode 100644 module/project/css/dynamic.css
 create mode 100755 module/project/view/dynamic.html.php

diff --git a/module/action/model.php b/module/action/model.php
index b73d8a3fe1..0adedc0c5a 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -672,15 +672,10 @@ class actionModel extends model
 
         /* If is project, select its related. */
         $executions = array();
-        $products   = array();
         if(is_numeric($projectID))
         {
             $project = $this->loadModel('project')->getByID($projectID);
-            if(isset($project->type) and $project->type == 'project')
-            {
-                $executions = $this->loadModel('execution')->getPairs($projectID);
-                $products   = $this->loadModel('product')->getProductPairsByProject($projectID);
-            }
+            if(isset($project->type) and $project->type == 'project') $executions = $this->loadModel('execution')->getPairs($projectID);
         }
 
         $this->loadModel('doc');
@@ -697,9 +692,12 @@ class actionModel extends model
             ->beginIF($date)->andWhere('date' . ($direction == 'next' ? '<' : '>') . "'{$date}'")->fi()
             ->beginIF($account != 'all')->andWhere('actor')->eq($account)->fi()
             ->beginIF(is_numeric($productID))->andWhere('product')->like("%,$productID,%")->fi()
-            ->beginIF(is_numeric($projectID))->andWhere('execution')->eq($projectID)->fi()
-            ->beginIF(!empty($executions))->markLeft()->orWhere('execution')->in($executions)->fi()->markRight()
-            ->beginIF(!empty($products))->markLeft()->orWhere('product')->in($products)->fi()->markRight()
+            ->andWhere()
+            ->markLeft(1)
+            ->where(1)
+            ->beginIF(is_numeric($projectID))->orWhere('execution')->eq($projectID)->fi()
+            ->beginIF(!empty($executions))->orWhere('execution')->in(array_keys($executions))->fi()
+            ->markRight(1)
             ->beginIF($productID == 'notzero')->andWhere('product')->gt(0)->andWhere('product')->notlike('%,0,%')->fi()
             ->beginIF($projectID == 'notzero')->andWhere('execution')->gt(0)->fi()
             ->beginIF($projectID == 'all' or $productID == 'all')->andWhere("IF((objectType!= 'doc' && objectType!= 'doclib'), ($condition), '1=1')")->fi()
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index e61a79c33a..79e3e090a2 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -896,7 +896,7 @@ $lang->menu->scrum->qa             = '测试|qa|index';
 $lang->menu->scrum->ci             = '代码|repo|browse';
 $lang->menu->scrum->projectbuild   = array('link' => '版本|projectbuild|browse|project={PROJECT}');
 $lang->menu->scrum->projectrelease = array('link' => '发布|projectrelease|browse|project={PROJECT}');
-$lang->menu->scrum->dynamic        = array('link' => '动态|project|dynamic');
+$lang->menu->scrum->dynamic        = array('link' => '动态|project|dynamic|project={PROJECT}');
 $lang->menu->scrum->other          = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder');
 $lang->menu->scrum->projectsetting = array('link' => '设置|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist');
 
diff --git a/module/project/control.php b/module/project/control.php
index d1b91b105f..f80ec8125b 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -580,6 +580,74 @@ class project extends control
         $this->display('group', 'create');
     }
 
+    /**
+     * Project dynamic.
+     *
+     * @param  int    $projectID
+     * @param  string $type
+     * @param  string $param
+     * @param  int    $recTotal
+     * @param  string $date
+     * @param  string $direction  next|pre
+     * @access public
+     * @return void
+     */
+    public function dynamic($projectID = 0, $type = 'today', $param = '', $recTotal = 0, $date = '', $direction = 'next')
+    {
+        @ini_set('memory_limit', '2048M');
+        /* Save session. */
+        $uri = $this->app->getURI(true);
+        $this->session->set('productList',     $uri);
+        $this->session->set('productPlanList', $uri);
+        $this->session->set('releaseList',     $uri);
+        $this->session->set('storyList',       $uri);
+        $this->session->set('executionList',   $uri);
+        $this->session->set('taskList',        $uri);
+        $this->session->set('buildList',       $uri);
+        $this->session->set('bugList',         $uri);
+        $this->session->set('caseList',        $uri);
+        $this->session->set('testtaskList',    $uri);
+
+        /* Append id for secend sort. */
+        $orderBy = $direction == 'next' ? 'date_desc' : 'date_asc';
+        $sort    = $this->loadModel('common')->appendOrder($orderBy);
+
+        /* Set the pager. */
+        $this->app->loadClass('pager', $static = true);
+        $pager = new pager($recTotal, $recPerPage = 50, $pageID = 1);
+
+        /* Set the user and type. */
+        $account = 'all';
+        if($type == 'account')
+        {
+            $user = $this->loadModel('user')->getById($param, 'account');
+            if($user) $account = $user->account;
+        }
+        $period  = $type == 'account' ? 'all'  : $type;
+        $date    = empty($date) ? '' : date('Y-m-d', $date);
+        $actions = $this->loadModel('action')->getDynamic($account, $period, $sort, $pager, 'all', $projectID, $date, $direction);
+
+        /* The header and position. */
+        $project = $this->project->getByID($projectID);
+        $this->view->title      = $project->name . $this->lang->colon . $this->lang->project->dynamic;
+        $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
+        $this->view->position[] = $this->lang->project->dynamic;
+
+        $this->view->userIdPairs  = $this->project->getTeamMemberPairs($project->parent);
+        $this->view->accountPairs = $this->loadModel('user')->getPairs('noletter|nodeleted');
+
+        /* Assign. */
+        $this->view->projectID = $projectID;
+        $this->view->type        = $type;
+        $this->view->orderBy     = $orderBy;
+        $this->view->pager       = $pager;
+        $this->view->account     = $account;
+        $this->view->param       = $param;
+        $this->view->dateGroups  = $this->action->buildDateGroup($actions, $direction, $type);
+        $this->view->direction   = $direction;
+        $this->display();
+    }
+
     /**
      * Project manage view.
      *
diff --git a/module/project/css/dynamic.css b/module/project/css/dynamic.css
new file mode 100644
index 0000000000..ca418df21d
--- /dev/null
+++ b/module/project/css/dynamic.css
@@ -0,0 +1,21 @@
+#mainMenu .btn-group ul.dropdown-menu{max-height: 300px; overflow: auto;}
+#dynamics {padding: 10px 0;}
+.dynamic {position: relative; padding-left: 170px;}
+.dynamic-date {position: absolute; left: 0; top: 0; width: 150px; border: 2px solid #eee; border-radius: 4px; padding: 14px 20px; height: 58px;}
+.dynamic-date:before {content: ' '; display: block; position: absolute; right: -22px; top: 26px; height: 2px; width: 20px; background-color: #eee;}
+.dynamic-date > .date-label,
+.dynamic-date > .date-text {font-size: 18px; display: block;}
+.dynamic-date > .date-label + .date-text {font-size: 14px; line-height: 14px;}
+.dynamic-date > .date-label {margin-top: -8px;}
+.dynamic-date > .btn {position: absolute; right: 10px; top: 15px;}
+.dynamic .timeline {border: 2px solid #eee; border-radius: 4px; margin-bottom: 20px; padding: 10px 20px 10px 100px; transition: max-height .2s; overflow: hidden;}
+.dynamic .timeline-tag {left: -75px; font-size: 14px; color: #838A9D;}
+.dynamic .timeline-text {color: #3C4353;}
+.dynamic .text-muted {color: #838A9D;}
+.dynamic .label-id {top: -1px;}
+.dynamic.active .timeline,
+.dynamic.active .dynamic-date {border-color: #00a9fc;}
+.dynamic.active .dynamic-date:before {background-color: #00a9fc;}
+.dynamic.collapsed .timeline {max-height: 58px;}
+.dynamic.collapsed .timeline > li + li {display: none;}
+.dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8'; }
diff --git a/module/project/view/dynamic.html.php b/module/project/view/dynamic.html.php
new file mode 100755
index 0000000000..1c99f2b2c1
--- /dev/null
+++ b/module/project/view/dynamic.html.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * The action->dynamic view file of dashboard module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     dashboard
+ * @version     $Id: action->dynamic.html.php 1477 2011-03-01 15:25:50Z wwccss $
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include '../../common/view/header.html.php';?>
+<div id="mainMenu" class="clearfix">
+  <div class="btn-toolbar pull-left">
+    <?php foreach($lang->action->periods as $period => $label):?>
+    <?php
+    $label  = "<span class='text'>$label</span>";
+    $active = '';
+    if($period == $type)
+    {
+        $active = 'btn-active-text';
+        $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
+    }
+    echo html::a(inlink('dynamic', "projectID=$projectID&type=$period"), $label, '', "class='btn btn-link $active' id='{$period}'")
+    ?>
+    <?php endforeach;?>
+    <div class="btn-group">
+      <?php
+      $withSearch = count($accountPairs) > 8;
+      $active     = $param ? 'btn-active-text' : '';
+      $current    = $param ? zget($accountPairs, $account, $account) : $lang->execution->viewByUser;
+      $current    = "<span class='text'>" . $current . '</span>' . ' <span class="caret"></span>';
+      ?>
+      <?php echo html::a('###', $current, '', "class='btn btn-link $active' data-toggle='dropdown'");?>
+      <div class="dropdown-menu search-list<?php if($withSearch) echo ' search-box-sink';?>" data-ride="searchList">
+        <?php if($withSearch):?>
+        <div class="input-control search-box has-icon-left has-icon-right search-example">
+          <input id="userSearchBox" type="search" autocomplete="off" class="form-control search-input">
+          <label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
+          <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
+        </div>
+        <?php endif;?>
+        <div class='list-group'>
+          <?php
+          $usersPinYin = common::convert2Pinyin($userIdPairs);
+          foreach($userIdPairs as $userID => $name)
+          {
+              if(!$userID) continue;
+              $searchKey = $withSearch ? ('data-key="' . zget($usersPinYin, $name, '') . '"') : '';
+              echo html::a($this->createLink('project', 'dynamic', "projectID=$projectID&type=account&param=$userID"), $name, '', $searchKey);
+          }
+          ?>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div id="mainContent" class="main-content">
+  <?php if(empty($dateGroups)):?>
+  <div class="table-empty-tip">
+    <p><span class="text-muted"><?php echo $lang->action->noDynamic;?></span></p>
+  </div>
+  <?php else:?>
+  <div id="dynamics">
+    <?php $firstAction = '';?>
+    <?php foreach($dateGroups as $date => $actions):?>
+    <?php $isToday = date(DT_DATE4) == $date;?>
+    <div class="dynamic <?php if($isToday) echo 'active';?>">
+      <div class="dynamic-date <?php if($type == 'all') echo 'w-200px';?>">
+        <?php if($isToday):?>
+        <span class="date-label"><?php echo $lang->action->dynamic->today;?></span>
+        <?php endif;?>
+        <span class="date-text"><?php echo $date;?></span>
+        <button type="button" class="btn btn-info btn-icon btn-sm dynamic-btn"><i class="icon icon-caret-down"></i></button>
+      </div>
+      <ul class="timeline timeline-tag-left <?php if($type == 'all') echo 'margin-l-50px';?>">
+        <?php if($direction == 'next') $actions = array_reverse($actions);?>
+        <?php foreach($actions as $i => $action):?>
+        <?php if(empty($firstAction)) $firstAction = $action;?>
+        <li <?php if($action->major) echo "class='active'";?>>
+          <div>
+            <span class="timeline-tag"><?php echo $action->time?></span>
+            <span class="timeline-text">
+              <?php echo zget($accountPairs, $action->actor);?>
+              <span class='label-action'><?php echo ' ' . $action->actionLabel;?></span>
+              <span class="text"><?php echo $action->objectLabel;?></span>
+              <span class="label label-id"><?php echo $action->objectID;?></span>
+              <?php echo html::a($action->objectLink, $action->objectName);?>
+            </span>
+          </div>
+        </li>
+        <?php endforeach;?>
+      </ul>
+    </div>
+    <?php endforeach;?>
+  </div>
+  <?php endif;?>
+</div>
+<?php if(!empty($firstAction)):?>
+<?php
+$firstDate = date('Y-m-d', strtotime($firstAction->originalDate) + 24 * 3600);
+$lastDate  = substr($action->originalDate, 0, 10);
+$hasPre    = $this->action->hasPreOrNext($firstDate, 'pre');
+$hasNext   = $this->action->hasPreOrNext($lastDate, 'next');
+$preLink   = $hasPre ? inlink('dynamic', "projectID=$projectID&type=$type&param=$param&recTotal={$pager->recTotal}&date=" . strtotime($firstDate) . '&direction=pre') : 'javascript:;';
+$nextLink  = $hasNext ? inlink('dynamic', "projectID=$projectID&type=$type&param=$param&recTotal={$pager->recTotal}&date=" . strtotime($lastDate) . '&direction=next') : 'javascript:;';
+?>
+<?php if($hasPre or $hasNext):?>
+<div id="mainActions" class='main-actions'>
+  <nav class="container">
+    <a id="prevPage" class="btn btn-info<?php if(!$hasNext) echo ' disabled';?>" href="<?php echo $nextLink;?>"><i class="icon icon-chevron-left"></i></a>
+    <a id="nextPage" class="btn btn-info<?php if(!$hasPre) echo ' disabled';?>" href="<?php echo $preLink;?>"><i class="icon icon-chevron-right"></i></a>
+  </nav>
+</div>
+<?php endif;?>
+<?php endif;?>
+<script>
+$(function()
+{
+    $('#dynamics').on('click', '.dynamic-btn', function()
+    {
+        $(this).closest('.dynamic').toggleClass('collapsed');
+    });
+})
+</script>
+<?php include '../../common/view/footer.html.php';?>

From a98432e9580d40a9a00430cd2799218bc9c2fed0 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Wed, 10 Mar 2021 09:29:05 +0800
Subject: [PATCH 03/16]  * Finish task #36496.

---
 module/project/control.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index 83df035d40..a3573de746 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -587,7 +587,8 @@ class project extends control
      */
     public function dynamic($projectID = 0, $type = 'today', $param = '', $recTotal = 0, $date = '', $direction = 'next')
     {
-        @ini_set('memory_limit', '2048M');
+        $this->lang->noMenuModule[] = 'project';
+
         /* Save session. */
         $uri = $this->app->getURI(true);
         $this->session->set('productList',     $uri);
@@ -630,14 +631,14 @@ class project extends control
         $this->view->accountPairs = $this->loadModel('user')->getPairs('noletter|nodeleted');
 
         /* Assign. */
-        $this->view->projectID = $projectID;
-        $this->view->type        = $type;
-        $this->view->orderBy     = $orderBy;
-        $this->view->pager       = $pager;
-        $this->view->account     = $account;
-        $this->view->param       = $param;
-        $this->view->dateGroups  = $this->action->buildDateGroup($actions, $direction, $type);
-        $this->view->direction   = $direction;
+        $this->view->projectID  = $projectID;
+        $this->view->type       = $type;
+        $this->view->orderBy    = $orderBy;
+        $this->view->pager      = $pager;
+        $this->view->account    = $account;
+        $this->view->param      = $param;
+        $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $type);
+        $this->view->direction  = $direction;
         $this->display();
     }
 

From d2734ecaccd115b3d40dd34162623d72c736d6ce Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Wed, 10 Mar 2021 09:57:37 +0800
Subject: [PATCH 04/16] * Finish task#36456.

---
 module/index/css/index.css | 4 ++--
 module/index/js/index.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/index/css/index.css b/module/index/css/index.css
index e37dc2c621..8961806ea5 100644
--- a/module/index/css/index.css
+++ b/module/index/css/index.css
@@ -61,10 +61,10 @@ body.menu-hide {padding-left: 0;}
 #userNav .dropdown-submenu:focus > a, #userNav .dropdown-submenu:hover > a {background-color: rgba(0,0,0,.2);}
 #poweredBy{width: 40%; position: absolute; top: 4px; right: 0; padding: 0;}
 
-#globalSearchDiv{width:50%; float: right; margin-right: 4px;}
+#globalSearchDiv{width:52%; float: right; margin-right: 4px;}
 @media screen and (max-height: 768px)
 {
-  #globalSearchDiv{width: 60%;}
+  #globalSearchDiv{width: 62%;}
 }
 #globalSearchDiv .input-group{width: 82%; float: right; margin-top: 2px;}
 @media screen and (max-height: 768px)
diff --git a/module/index/js/index.js b/module/index/js/index.js
index 3ea5f24731..774584d135 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -531,7 +531,7 @@ $.extend(
     gotoObject:function()
     {
         objectType  = $('#searchType').attr('value');
-        objectValue = $('input#globalSearchInput').attr('value');
+        objectValue = $('#globalSearchInput').attr('value');
 
         if(objectType && objectValue)
         {
@@ -590,7 +590,7 @@ $(function()
                     var $this = $(this);
                     var isActiveType = $this.data('value') === searchType && searchType !== 'all';
                     $this.closest('li').toggleClass('selected active', isActiveType);
-                    $this.html($this.data('name') + ' <span>#' + (val.length > 4 ? (val.substr(0, 4) + '...') : val) + "</span>");
+                    $this.html($this.data('name') + ' <span>#' + (val.length > 7 ? (val.substr(0, 7) + '...') : val) + "</span>");
                     if(isActiveType) $dropmenu.addClass('with-active');
                 });
             }

From b608fc809da5a74386bd1dc35223572c8b1f3965 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Wed, 10 Mar 2021 10:11:46 +0800
Subject: [PATCH 05/16] * Finish task#36497.

---
 module/common/view/header.html.php | 11 ++++++-----
 module/execution/model.php         | 31 ++++++++++++++++++++++++++++++
 module/project/model.php           |  1 -
 3 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php
index 24a36a5676..f63940aeeb 100755
--- a/module/common/view/header.html.php
+++ b/module/common/view/header.html.php
@@ -20,13 +20,14 @@ $isQa        = $rawModule == 'qa';
   <div id='mainHeader'>
     <div class='container'>
       <div id='heading'>
-        <?php if($isProduct) echo isset($lang->product->switcherMenu) ? $lang->product->switcherMenu : '';?>
-        <?php if($isQa)      echo isset($lang->qa->switcherMenu) ? $lang->qa->switcherMenu : '';?>
+        <?php if($isProduct)   echo isset($lang->product->switcherMenu) ? $lang->product->switcherMenu : '';?>
+        <?php if($isQa)        echo isset($lang->qa->switcherMenu) ? $lang->qa->switcherMenu : '';?>
         <?php if($this->config->systemMode == 'new'):?>
-        <?php if($isProgram) echo isset($lang->program->switcherMenu) ? $lang->program->switcherMenu : '';?>
-        <?php if($isProject) echo $this->loadModel('project')->getSwitcher($this->session->PRJ, $app->rawModule, $app->rawMethod);?>
+        <?php if($isProgram)   echo isset($lang->program->switcherMenu) ? $lang->program->switcherMenu : '';?>
+        <?php if($isProject)   echo $this->loadModel('project')->getSwitcher($this->session->PRJ, $app->rawModule, $app->rawMethod);?>
+        <?php if($isExecution) echo $this->execution->getSwitcher($this->session->execution, $app->rawModule, $app->rawMethod);?>
         <?php elseif($this->config->systemMode == 'classic'):?>
-        <?php if($isProject) echo isset($lang->project->switcherMenu) ? $lang->project->switcherMenu : '';;?>
+        <?php if($isProject)   echo isset($lang->project->switcherMenu) ? $lang->project->switcherMenu : '';;?>
         <?php endif;?>
       </div>
       <nav id='navbar'><?php commonModel::printMainmenu($app->rawModule, $app->rawMethod);?></nav>
diff --git a/module/execution/model.php b/module/execution/model.php
index ac8b393721..ba48b246d8 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -877,11 +877,42 @@ class executionModel extends model
      */
     public function getMainAction($module, $method)
     {
+        if($method == 'index' or $method == 'all') return;
+
         $link = html::a(helper::createLink('execution', 'all'), "<i class='icon icon-list'></i>", '', "style='border: none;'");
         $html = "<p style='padding-top:5px;'>" . $link . "</p>";
+
         return common::hasPriv('execution', 'all') ? $html : '';
     }
 
+    /*
+     * Get execution switcher.
+     *
+     * @param  int     $executionID
+     * @param  string  $currentModule
+     * @param  string  $currentMethod
+     * @access public
+     * @return string
+     */
+    public function getSwitcher($executionID, $currentModule, $currentMethod)
+    {
+        $this->session->set('moreExecutionLink', $this->app->getURI(true));
+
+        $currentExecutionName = $this->lang->execution->common;
+        if($executionID)
+        {
+            $currentExecution     = $this->getById($executionID);
+            $currentExecutionName = $currentExecution->name;
+        }
+
+        $dropMenuLink = helper::createLink('execution', 'ajaxGetDropMenu', "objectID=$executionID&module=$currentModule&method=$currentMethod&extra=");
+        $output  = "<div class='btn-group header-angle-btn' id='swapper'><button data-toggle='dropdown' type='button' class='btn' id='currentItem' title='{$currentExecutionName}'><span class='text'><i class='icon icon-project'></i> {$currentExecutionName}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
+        $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
+        $output .= "</div></div>";
+
+        return $output;
+    }
+
     /**
      * Get project pairs.
      *
diff --git a/module/project/model.php b/module/project/model.php
index 5a2264225c..67505c5ab8 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -144,7 +144,6 @@ class projectModel extends model
     {
         $this->session->set('moreProjectLink', $this->app->getURI(true));
 
-        $this->loadModel('project');
         $currentProjectName = $this->lang->project->common;
         if($projectID)
         {

From c8036c78900e2b1055551ef7bd7957787b0584ba Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Wed, 10 Mar 2021 10:23:54 +0800
Subject: [PATCH 06/16] * Fix bug.

---
 module/execution/view/ajaxgetdropmenu.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php
index 5354282d6f..bcb55035d0 100644
--- a/module/execution/view/ajaxgetdropmenu.html.php
+++ b/module/execution/view/ajaxgetdropmenu.html.php
@@ -49,7 +49,7 @@ foreach($executions as $execution)
     ?>
     </div>
     <div class="col-footer">
-      <?php echo html::a(helper::createLink('program', 'prjbrowse'), '<i class="icon icon-cards-view muted"></i> ' . $lang->execution->all, '', 'class="not-list-item"'); ?>
+      <?php echo html::a(helper::createLink('execution', 'all'), '<i class="icon icon-cards-view muted"></i> ' . $lang->execution->all, '', 'class="not-list-item"'); ?>
       <a class='pull-right toggle-right-col not-list-item'><?php echo $lang->execution->doneProjects?><i class='icon icon-angle-right'></i></a>
     </div>
   </div>

From 183feb39368b4cc0b44ea55e7baa7237f4b8c695 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Wed, 10 Mar 2021 10:24:13 +0800
Subject: [PATCH 07/16] * Finish task #36465.

---
 module/common/lang/de.php        | 17 ++++++----------
 module/common/lang/en.php        | 17 ++++++----------
 module/common/lang/fr.php        | 17 ++++++----------
 module/common/lang/menuOrder.php | 33 +++++++++++++++-----------------
 module/common/lang/vi.php        | 15 +++++----------
 module/common/lang/zh-cn.php     | 20 +++++++++----------
 module/company/control.php       |  6 ++++++
 module/index/js/index.js         |  2 ++
 module/my/control.php            |  3 +++
 module/project/js/browse.js      |  1 -
 module/user/model.php            |  3 +--
 11 files changed, 60 insertions(+), 74 deletions(-)

diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 8f95d4b7d1..600abec13f 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -148,7 +148,7 @@ $lang->mainNav->qa      = '<i class="icon icon-test"></i> Test|qa|index|';
 $lang->mainNav->repo    = '<i class="icon icon-code1"></i> Code|repo|browse|';
 $lang->mainNav->doc     = '<i class="icon icon-doc"></i> Doc|doc|index|';
 $lang->mainNav->report  = "<i class='icon icon-statistic'></i> Statistic|report|productsummary|";
-$lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
+$lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|my|team|';
 $lang->mainNav->admin   = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
 if($config->systemMode == 'new') $lang->mainNav->program = "<i class='icon icon-program'></i> Program|$programModule|$programMethod|";
 
@@ -219,11 +219,10 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->company   = array('link' => 'Global Settings|custom|browsestoryconcept|', 'subModule' => 'holiday');
-
-$lang->subject = new stdclass();
-$lang->subject->menu = new stdclass();
-$lang->subject->menu->storyConcept = array('link' => 'Story Concept|custom|browsestoryconcept|');
+$lang->system->menu->team     = array('link' => 'Team|my|team|', 'subModule' => 'user');
+$lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
+$lang->system->menu->dynamic  = 'Dynamic|company|dynamic|';
+$lang->system->menu->view     = array('link' => 'Company|company|view');
 
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
@@ -289,7 +288,6 @@ $lang->my = new stdclass();
 $lang->my->menu = new stdclass();
 
 $lang->my->menu->index       = 'Index|my|index';
-$lang->my->menu->calendar    = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
 $lang->my->menu->myWork      = array('link' => 'Work|my|work|mode=task');
 if($config->systemMode == 'new')
 {
@@ -303,7 +301,6 @@ else
 $lang->my->menu->contribute  = array('link' => 'Contribute|my|contribute|mode=task');
 $lang->my->menu->dynamic     = 'Dynamic|my|dynamic|';
 $lang->my->menu->score       = 'Score|my|score|';
-$lang->my->menu->team        = array('link' => 'Team|my|team|', 'subModule' => 'user');
 $lang->my->menu->contacts    = 'Contacts|my|managecontacts|';
 
 $lang->my->workMenu = new stdclass();
@@ -322,7 +319,7 @@ $lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
 $lang->my->contributeMenu->testcase    = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
 $lang->my->contributeMenu->testtask    = 'Test Task|my|contribute|mode=testtask&type=done';
 
-$lang->my->dividerMenu = ',myProject,team,';
+$lang->my->dividerMenu = ',myWork,score,';
 
 $lang->todo = new stdclass();
 $lang->todo->menu = $lang->my->menu;
@@ -516,8 +513,6 @@ $lang->company->menu = new stdclass();
 $lang->company->menu->browseUser  = array('link' => 'Benutzer|company|browse', 'subModule' => 'user');
 $lang->company->menu->dept        = array('link' => 'Abteilung|dept|browse', 'subModule' => 'dept');
 $lang->company->menu->browseGroup = array('link' => 'Gruppen|group|browse', 'subModule' => 'group');
-$lang->company->menu->dynamic     = 'Verlauf|company|dynamic|';
-$lang->company->menu->view        = array('link' => 'Unternehmen|company|view');
 
 /* Admin menu settings. */
 $lang->admin = new stdclass();
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index acd0fd49c7..1d16ce4860 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -148,7 +148,7 @@ $lang->mainNav->qa      = '<i class="icon icon-test"></i> Test|qa|index|';
 $lang->mainNav->repo    = '<i class="icon icon-code1"></i> Code|repo|browse|';
 $lang->mainNav->doc     = '<i class="icon icon-doc"></i> Doc|doc|index|';
 $lang->mainNav->report  = "<i class='icon icon-statistic'></i> Statistic|report|productsummary|";
-$lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
+$lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|my|team|';
 $lang->mainNav->admin   = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
 if($config->systemMode == 'new') $lang->mainNav->program = "<i class='icon icon-program'></i> Program|$programModule|$programMethod|";
 
@@ -219,11 +219,10 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->company   = array('link' => 'Global Settings|custom|browsestoryconcept|', 'subModule' => 'holiday');
-
-$lang->subject = new stdclass();
-$lang->subject->menu = new stdclass();
-$lang->subject->menu->storyConcept = array('link' => 'Story Concept|custom|browsestoryconcept|');
+$lang->system->menu->team     = array('link' => 'Team|my|team|', 'subModule' => 'user');
+$lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
+$lang->system->menu->dynamic  = 'Dynamic|company|dynamic|';
+$lang->system->menu->view     = array('link' => 'Company|company|view');
 
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
@@ -289,7 +288,6 @@ $lang->my = new stdclass();
 $lang->my->menu = new stdclass();
 
 $lang->my->menu->index       = 'Index|my|index';
-$lang->my->menu->calendar    = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
 $lang->my->menu->myWork      = array('link' => 'Work|my|work|mode=task');
 if($config->systemMode == 'new')
 {
@@ -303,7 +301,6 @@ else
 $lang->my->menu->contribute  = array('link' => 'Contribute|my|contribute|mode=task');
 $lang->my->menu->dynamic     = 'Dynamic|my|dynamic|';
 $lang->my->menu->score       = 'Score|my|score|';
-$lang->my->menu->team        = array('link' => 'Team|my|team|', 'subModule' => 'user');
 $lang->my->menu->contacts    = 'Contacts|my|managecontacts|';
 
 $lang->my->workMenu = new stdclass();
@@ -322,7 +319,7 @@ $lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
 $lang->my->contributeMenu->testcase    = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
 $lang->my->contributeMenu->testtask    = 'Test Task|my|contribute|mode=testtask&type=done';
 
-$lang->my->dividerMenu = ',myProject,team,';
+$lang->my->dividerMenu = ',myWork,score,';
 
 $lang->todo       = new stdclass();
 $lang->todo->menu = $lang->my->menu;
@@ -516,8 +513,6 @@ $lang->company->menu = new stdclass();
 $lang->company->menu->browseUser  = array('link' => 'User|company|browse', 'subModule' => ',user,');
 $lang->company->menu->dept        = array('link' => 'Dept|dept|browse', 'subModule' => 'dept');
 $lang->company->menu->browseGroup = array('link' => 'Group|group|browse', 'subModule' => 'group');
-$lang->company->menu->dynamic     = 'Dynamic|company|dynamic|';
-$lang->company->menu->view        = array('link' => 'Company|company|view');
 
 /* Admin menu settings. */
 $lang->admin = new stdclass();
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 930f2a06d4..5fc3b7c015 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -148,7 +148,7 @@ $lang->mainNav->qa      = '<i class="icon icon-test"></i> Test|qa|index|';
 $lang->mainNav->repo    = '<i class="icon icon-code1"></i> Code|repo|browse|';
 $lang->mainNav->doc     = '<i class="icon icon-doc"></i> Doc|doc|index|';
 $lang->mainNav->report  = "<i class='icon icon-statistic'></i> Statistic|report|productsummary|";
-$lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
+$lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|my|team|';
 $lang->mainNav->admin   = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
 if($config->systemMode == 'new') $lang->mainNav->program = "<i class='icon icon-program'></i> Program|$programModule|$programMethod|";
 
@@ -219,11 +219,10 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->company   = array('link' => 'Global Settings|custom|browsestoryconcept|', 'subModule' => 'holiday');
-
-$lang->subject = new stdclass();
-$lang->subject->menu = new stdclass();
-$lang->subject->menu->storyConcept = array('link' => 'Story Concept|custom|browsestoryconcept|');
+$lang->system->menu->team     = array('link' => 'Team|my|team|', 'subModule' => 'user');
+$lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
+$lang->system->menu->dynamic  = 'Dynamic|company|dynamic|';
+$lang->system->menu->view     = array('link' => 'Company|company|view');
 
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
@@ -289,7 +288,6 @@ $lang->my = new stdclass();
 $lang->my->menu = new stdclass();
 
 $lang->my->menu->index       = 'Index|my|index';
-$lang->my->menu->calendar    = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
 $lang->my->menu->myWork      = array('link' => 'Work|my|work|mode=task');
 if($config->systemMode == 'new')
 {
@@ -303,7 +301,6 @@ else
 $lang->my->menu->contribute  = array('link' => 'Contribute|my|contribute|mode=task');
 $lang->my->menu->dynamic     = 'Dynamic|my|dynamic|';
 $lang->my->menu->score       = 'Score|my|score|';
-$lang->my->menu->team        = array('link' => 'Team|my|team|', 'subModule' => 'user');
 $lang->my->menu->contacts    = 'Contacts|my|managecontacts|';
 
 $lang->my->workMenu = new stdclass();
@@ -322,7 +319,7 @@ $lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
 $lang->my->contributeMenu->testcase    = 'Test Case|my|contribute|mode=testtask&type=openedbyme';
 $lang->my->contributeMenu->testtask    = 'Test Task|my|contribute|mode=testtask&type=done';
 
-$lang->my->dividerMenu = ',myProject,team,';
+$lang->my->dividerMenu = ',myWork,score,';
 
 $lang->todo       = new stdclass();
 $lang->todo->menu = $lang->my->menu;
@@ -516,8 +513,6 @@ $lang->company->menu = new stdclass();
 $lang->company->menu->browseUser  = array('link' => 'Utilisateurs|company|browse', 'subModule' => 'user');
 $lang->company->menu->dept        = array('link' => 'Compartiments|dept|browse', 'subModule' => 'dept');
 $lang->company->menu->browseGroup = array('link' => 'Privilèges|group|browse', 'subModule' => 'group');
-$lang->company->menu->dynamic     = 'Historique|company|dynamic|';
-$lang->company->menu->view        = array('link' => 'Entreprise|company|view');
 
 /* Admin menu settings. */
 $lang->admin = new stdclass();
diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index 9c4dc357d6..34ebb1b60d 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -49,16 +49,14 @@ $lang->index->menuOrder[10] = 'project';
 
 /* my menu order. */
 $lang->my->menuOrder[5]  = 'index';
-$lang->my->menuOrder[10] = 'calendar';
-$lang->my->menuOrder[15] = 'myWork';
-$lang->my->menuOrder[20] = 'myProject';
-$lang->my->menuOrder[25] = 'myExecution';
-$lang->my->menuOrder[30] = 'contribute';
-$lang->my->menuOrder[35] = 'score';
-$lang->my->menuOrder[40] = 'dynamic';
-$lang->my->menuOrder[45] = 'follow';
-$lang->my->menuOrder[50] = 'team';
-$lang->my->menuOrder[55] = 'contacts';
+$lang->my->menuOrder[10] = 'myWork';
+$lang->my->menuOrder[15] = 'myProject';
+$lang->my->menuOrder[20] = 'myExecution';
+$lang->my->menuOrder[25] = 'contribute';
+$lang->my->menuOrder[30] = 'score';
+$lang->my->menuOrder[35] = 'dynamic';
+$lang->my->menuOrder[40] = 'follow';
+$lang->my->menuOrder[45] = 'contacts';
 $lang->todo->menuOrder = $lang->my->menuOrder;
 
 /* product menu order. */
@@ -142,19 +140,18 @@ $lang->report->menuOrder[25] = 'staff';
 $lang->company->menuOrder[5]  = 'browseUser';
 $lang->company->menuOrder[10] = 'dept';
 $lang->company->menuOrder[15] = 'browseGroup';
-$lang->company->menuOrder[20] = 'dynamic';
-$lang->company->menuOrder[25] = 'view';
-$lang->company->menuOrder[30] = 'addGroup';
-$lang->company->menuOrder[35] = 'batchAddUser';
-$lang->company->menuOrder[40] = 'addUser';
+$lang->company->menuOrder[20] = 'addGroup';
+$lang->company->menuOrder[25] = 'batchAddUser';
+$lang->company->menuOrder[30] = 'addUser';
 $lang->dept->menuOrder        = $lang->company->menuOrder;
 $lang->group->menuOrder       = $lang->company->menuOrder;
 $lang->user->menuOrder        = $lang->company->menuOrder;
 
 /* system menu order. */
-$lang->system->menuOrder[5]  = 'company';
-$lang->system->menuOrder[10] = 'scrum';
-$lang->system->menuOrder[15] = 'waterfall';
+$lang->system->menuOrder[5]  = 'team';
+$lang->system->menuOrder[10] = 'calendar';
+$lang->system->menuOrder[15] = 'dynamic';
+$lang->system->menuOrder[20] = 'view';
 
 /* admin menu order. */
 $lang->admin->menuOrder[5]  = 'index';
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 581daef645..128ae940d3 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -148,7 +148,7 @@ $lang->mainNav->qa      = '<i class="icon icon-test"></i> Test|qa|index|';
 $lang->mainNav->repo    = '<i class="icon icon-code1"></i> Code|repo|browse|';
 $lang->mainNav->doc     = '<i class="icon icon-doc"></i> Doc|doc|index|';
 $lang->mainNav->report  = "<i class='icon icon-statistic'></i> Statistic|report|productsummary|";
-$lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|custom|estimate|';
+$lang->mainNav->system  = '<i class="icon icon-menu-users"></i> System|my|team|';
 $lang->mainNav->admin   = '<i class="icon icon-menu-backend"></i> Admin|admin|index|';
 if($config->systemMode == 'new') $lang->mainNav->program = "<i class='icon icon-program'></i> Program|$programModule|$programMethod|";
 
@@ -219,11 +219,10 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->company   = array('link' => 'Global Settings|custom|browsestoryconcept|', 'subModule' => 'holiday');
-
-$lang->subject = new stdclass();
-$lang->subject->menu = new stdclass();
-$lang->subject->menu->storyConcept = array('link' => 'Story Concept|custom|browsestoryconcept|');
+$lang->system->menu->team     = array('link' => 'Team|my|team|', 'subModule' => 'user');
+$lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
+$lang->system->menu->dynamic  = 'Dynamic|company|dynamic|';
+$lang->system->menu->view     = array('link' => 'Company|company|view');
 
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
@@ -289,7 +288,6 @@ $lang->my = new stdclass();
 $lang->my->menu = new stdclass();
 
 $lang->my->menu->index       = 'Index|my|index';
-$lang->my->menu->calendar    = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
 $lang->my->menu->myWork      = array('link' => 'Work|my|work|mode=task');
 if($config->systemMode == 'new')
 {
@@ -303,7 +301,6 @@ else
 $lang->my->menu->contribute  = array('link' => 'Contribute|my|contribute|mode=task');
 $lang->my->menu->dynamic     = 'Dynamic|my|dynamic|';
 $lang->my->menu->score       = 'Score|my|score|';
-$lang->my->menu->team        = array('link' => 'Team|my|team|', 'subModule' => 'user');
 $lang->my->menu->contacts    = 'Contacts|my|managecontacts|';
 
 $lang->my->workMenu = new stdclass();
@@ -516,8 +513,6 @@ $lang->company->menu = new stdclass();
 $lang->company->menu->browseUser  = array('link' => 'Người dùng|company|browse', 'subModule' => 'user');
 $lang->company->menu->dept        = array('link' => 'Phòng/Ban|dept|browse', 'subModule' => 'dept');
 $lang->company->menu->browseGroup = array('link' => 'Phân quyền|group|browse', 'subModule' => 'group');
-$lang->company->menu->dynamic     = 'Lịch sử|company|dynamic|';
-$lang->company->menu->view        = array('link' => 'Doanh nghiệp|company|view');
 
 /* Admin menu settings. */
 $lang->admin = new stdclass();
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index bffb9ba04f..c0b0704f52 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -148,7 +148,7 @@ $lang->mainNav->qa      = '<i class="icon icon-test"></i> 测试|qa|index|';
 $lang->mainNav->repo    = '<i class="icon icon-code1"></i> 代码|repo|browse|';
 $lang->mainNav->doc     = '<i class="icon icon-doc"></i> 文档|doc|index|';
 $lang->mainNav->report  = "<i class='icon icon-statistic'></i> 统计|report|productSummary|";
-$lang->mainNav->system  = '<i class="icon icon-group"></i> 组织|custom|browsestoryconcept|';
+$lang->mainNav->system  = '<i class="icon icon-group"></i> 组织|my|team|';
 $lang->mainNav->admin   = '<i class="icon icon-cog-outline"></i> 后台|admin|index|';
 if($config->systemMode == 'new') $lang->mainNav->program = "<i class='icon icon-program'></i> 项目集|$programModule|$programMethod|";
 
@@ -221,11 +221,15 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->company   = array('link' => '全局设置|custom|browsestoryconcept|', 'subModule' => 'holiday');
+$lang->system->menu->team     = array('link' => '团队|my|team|', 'subModule' => 'user');
+$lang->system->menu->calendar = array('link' => '日程|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
+$lang->system->menu->dynamic  = '动态|company|dynamic|';
+$lang->system->menu->view     = array('link' => '公司|company|view');
+//$lang->system->menu->company  = array('link' => '全局设置|custom|browsestoryconcept|', 'subModule' => 'holiday');
 
-$lang->subject = new stdclass();
-$lang->subject->menu = new stdclass();
-$lang->subject->menu->storyConcept = array('link' => '需求概念|custom|browsestoryconcept|');
+//$lang->subject = new stdclass();
+//$lang->subject->menu = new stdclass();
+//$lang->subject->menu->storyConcept = array('link' => '需求概念|custom|browsestoryconcept|');
 
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
@@ -291,7 +295,6 @@ $lang->my = new stdclass();
 $lang->my->menu = new stdclass();
 
 $lang->my->menu->index       = '仪表盘|my|index';
-$lang->my->menu->calendar    = array('link' => '日程|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
 $lang->my->menu->myWork      = array('link' => '待处理|my|work|mode=task');
 if($config->systemMode == 'new')
 {
@@ -305,7 +308,6 @@ else
 $lang->my->menu->contribute  = array('link' => '贡献|my|contribute|mode=task');
 $lang->my->menu->dynamic     = '动态|my|dynamic|';
 $lang->my->menu->score       = array('link' => '积分|my|score|', 'subModule' => 'score');
-$lang->my->menu->team        = array('link' => '团队|my|team|', 'subModule' => 'user');
 $lang->my->menu->contacts    = '联系人|my|managecontacts|';
 
 $lang->my->workMenu = new stdclass();
@@ -324,7 +326,7 @@ $lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
 $lang->my->contributeMenu->testcase    = '用例|my|contribute|mode=testcase&type=openedbyme';
 $lang->my->contributeMenu->testtask    = '测试单|my|contribute|mode=testtask&type=done';
 
-$lang->my->dividerMenu = ',myProject,team,';
+$lang->my->dividerMenu = ',myWork,score,';
 
 $lang->todo       = new stdclass();
 $lang->todo->menu = $lang->my->menu;
@@ -521,8 +523,6 @@ $lang->company->menu = new stdclass();
 $lang->company->menu->browseUser  = array('link' => '用户|company|browse', 'subModule' => ',user,');
 $lang->company->menu->dept        = array('link' => '部门|dept|browse', 'subModule' => 'dept');
 $lang->company->menu->browseGroup = array('link' => '权限|group|browse', 'subModule' => 'group');
-$lang->company->menu->dynamic     = '动态|company|dynamic|';
-$lang->company->menu->view        = array('link' => '公司|company|view');
 
 /* 后台管理菜单设置。*/
 $lang->admin = new stdclass();
diff --git a/module/company/control.php b/module/company/control.php
index b1ab021140..7fb824c385 100644
--- a/module/company/control.php
+++ b/module/company/control.php
@@ -147,6 +147,9 @@ class company extends control
      */
     public function view()
     {
+        $this->lang->navGroup->company = 'system';
+        $this->lang->noMenuModule[] = 'company';
+
         $this->company->setMenu();
         $this->view->title      = $this->lang->company->common . $this->lang->colon . $this->lang->company->view;
         $this->view->position[] = $this->lang->company->view;
@@ -167,6 +170,9 @@ class company extends control
      */
     public function dynamic($browseType = 'today', $param = '', $recTotal = 0, $date = '', $direction = 'next')
     {
+        $this->lang->navGroup->company = 'system';
+        $this->lang->noMenuModule[] = 'company';
+
         $this->company->setMenu();
         $this->app->loadLang('user');
         $this->app->loadLang('execution');
diff --git a/module/index/js/index.js b/module/index/js/index.js
index 774584d135..6fff2ff7fd 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -117,6 +117,8 @@
         {
             if(methodLowerCase === 'create' && (link.params.programID || link.params.$1)) return 'program';
         }
+        if(moduleName === 'my')      if(methodLowerCase === 'team' || methodLowerCase == 'calendar') return 'system';
+        if(moduleName === 'company') if(methodLowerCase === 'view' || methodLowerCase == 'dynamic') return 'system';
         if(moduleName === 'tree')
         {
             if(methodLowerCase === 'browse')
diff --git a/module/my/control.php b/module/my/control.php
index 7586287af1..dbe9775c20 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -129,6 +129,7 @@ class my extends control
      */
     public function todo($type = 'before', $userID = '', $status = 'all', $orderBy = "date_desc,status,begin", $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
+        $this->lang->navGroup->my = 'system';
         /* Save session. */
         $uri = $this->app->getURI(true);
         if($this->app->viewType != 'json')
@@ -615,6 +616,8 @@ class my extends control
      */
     public function team($orderBy = 'id', $recTotal = 0, $recPerPage = 15, $pageID = 1)
     {
+        $this->lang->navGroup->my = 'system';
+
         /* Set the pager. */
         $this->app->loadClass('pager', $static = true);
         $pager = new pager($recTotal, $recPerPage, $pageID);
diff --git a/module/project/js/browse.js b/module/project/js/browse.js
index 6efb00afd4..f3f57b523e 100644
--- a/module/project/js/browse.js
+++ b/module/project/js/browse.js
@@ -8,5 +8,4 @@ $(function()
     });
 });
 
-$('#project' + projectID).addClass('active');
 $(".tree .active").parent('li').addClass('active');
diff --git a/module/user/model.php b/module/user/model.php
index ee31789cd9..8fa6513a76 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -2467,8 +2467,7 @@ class userModel extends model
      */
     public function resetMenu()
     {
-        $this->lang->navGroup->user = 'my';
-        $this->lang->admin->menu    = $this->lang->my->menu;
+        $this->lang->navGroup->user = 'system';
         $this->lang->noMenuModule[] = 'user';
     }
 }

From e434046f8a6ea64d8a538d5d0c23e46d83848b18 Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Wed, 10 Mar 2021 10:24:33 +0800
Subject: [PATCH 08/16] * Finish task #36468.

---
 module/execution/control.php        |  2 +-
 module/product/control.php          | 30 ++++++++++++++++++++++-------
 module/product/model.php            | 15 ++++++++++++---
 module/product/view/browse.html.php |  1 +
 module/projectstory/control.php     |  3 +--
 module/story/model.php              |  6 +++---
 module/tree/model.php               | 27 ++++++++++++++++++++++----
 7 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 218b446514..bec99166b1 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -803,7 +803,7 @@ class execution extends control
         $this->view->orderBy      = $orderBy;
         $this->view->type         = $this->session->executionStoryBrowseType;
         $this->view->param        = $param;
-        $this->view->moduleTree   = $this->loadModel('tree')->getProjectStoryTreeMenu($executionID, $startModuleID = 0, array('treeModel', 'createExecutionStoryLink'));
+        $this->view->moduleTree   = $this->loadModel('tree')->getExecutionStoryTreeMenu($executionID, $startModuleID = 0, array('treeModel', 'createExecutionStoryLink'));
         $this->view->tabID        = 'story';
         $this->view->storyTasks   = $storyTasks;
         $this->view->storyBugs    = $storyBugs;
diff --git a/module/product/control.php b/module/product/control.php
index ac5957a401..97f1463622 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -132,7 +132,7 @@ class product extends control
         $this->loadModel('execution');
 
         /* Set product, module and query. */
-        $productID = $this->product->saveState($productID, $this->products);
+        $productID = $this->app->rawModule != 'projectstory' ? $this->product->saveState($productID, $this->products) : $productID;
         $branch    = ($branch === '') ? (int)$this->cookie->preBranch : (int)$branch;
         setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
         setcookie('preBranch', (int)$branch, $this->config->cookieLife, $this->config->webRoot, '', false, true);
@@ -174,11 +174,25 @@ class product extends control
         {
             setcookie('treeBranch', (int)$branch, 0, $this->config->webRoot, '', false, false);
             $browseType = 'unclosed';
-            $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', $branch, "&param=$param&storyType=$storyType");
+            if($this->app->rawModule == 'projectstory' and empty($productID))
+            {
+                $moduleTree = $this->tree->getExecutionStoryTreeMenu($this->session->PRJ, 0, array('treeModel', 'createProjectStoryLink'));
+            }
+            else
+            {
+                $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', $branch, "&param=$param&storyType=$storyType");
+            }
         }
         else
         {
-            $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', (int)$this->cookie->treeBranch, "&param=$param&storyType=$storyType");
+            if($this->app->rawModule == 'projectstory' and empty($productID))
+            {
+                $moduleTree = $this->tree->getExecutionStoryTreeMenu($this->session->PRJ, 0, array('treeModel', 'createProjectStoryLink'));
+            }
+            else
+            {
+                $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', (int)$this->cookie->treeBranch, "&param=$param&storyType=$storyType");
+            }
         }
 
         if($browseType != 'bymodule' and $browseType != 'bybranch') $this->session->set('storyBrowseType', $browseType);
@@ -201,7 +215,7 @@ class product extends control
         $stories = $this->product->getStories($productID, $branch, $browseType, $queryID, $moduleID, $storyType, $sort, $pager);
         if($this->app->rawModule == 'projectstory')
         {
-            $this->session->set('currentProductType', $product->type);
+            if(!empty($product)) $this->session->set('currentProductType', $product->type);
             $projectProducts = $this->product->getProducts($this->session->PRJ);
             $productPlans    = $this->execution->getPlans($projectProducts);
 
@@ -244,13 +258,15 @@ class product extends control
         $showModule = !empty($this->config->datatable->productBrowse->showModule) ? $this->config->datatable->productBrowse->showModule : '';
         $this->view->modulePairs = $showModule ? $this->tree->getModulePairs($productID, 'story', $showModule) : array();
 
+        $productName = ($this->app->rawModule == 'projectstory' and empty($productID)) ? $this->lang->product->all : $this->products[$productID];
+
         /* Assign. */
-        $this->view->title           = $this->products[$productID]. $this->lang->colon . $this->lang->product->browse;
-        $this->view->position[]      = $this->products[$productID];
+        $this->view->title           = $productName . $this->lang->colon . $this->lang->product->browse;
+        $this->view->position[]      = $productName;
         $this->view->position[]      = $this->lang->product->browse;
         $this->view->productID       = $productID;
         $this->view->product         = $product;
-        $this->view->productName     = $this->products[$productID];
+        $this->view->productName     = $productName;
         $this->view->moduleID        = $moduleID;
         $this->view->stories         = $stories;
         $this->view->plans           = $this->loadModel('productplan')->getPairs($productID, $branch, '', true);
diff --git a/module/product/model.php b/module/product/model.php
index a81c632fcd..90a25c7106 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -823,9 +823,18 @@ class productModel extends model
     {
         $this->config->product->search['actionURL'] = $actionURL;
         $this->config->product->search['queryID']   = $queryID;
-        $this->config->product->search['params']['plan']['values']    = $this->loadModel('productplan')->getPairs($productID);
-        $this->config->product->search['params']['product']['values'] = array($productID => $products[$productID], 'all' => $this->lang->product->allProduct);
-        $this->config->product->search['params']['module']['values']  = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'story', $startModuleID = 0);
+        $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productID);
+
+        if($this->app->rawModule == 'projectstory' and empty($productID))
+        {
+            $this->config->product->search['params']['product']['values'] = array('all' => $this->lang->product->allProduct, 'all' => $this->lang->product->allProduct);
+        }
+        else
+        {
+            $this->config->product->search['params']['product']['values'] = array($productID => $products[$productID], 'all' => $this->lang->product->allProduct);
+        }
+
+        $this->config->product->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'story', $startModuleID = 0);
         if($this->session->currentProductType == 'normal')
         {
             unset($this->config->product->search['fields']['branch']);
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 2526773b87..1982955bcc 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -51,6 +51,7 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
       <a href='javascript:;' class='btn btn-link btn-limit text-ellipsis' data-toggle='dropdown' style="max-width: 120px;"><span class='text' title='<?php echo $productName;?>'><?php echo $productName;?></span> <span class='caret'></span></a>
       <ul class='dropdown-menu' style='max-height:240px; max-width: 300px; overflow-y:auto'>
         <?php
+        echo "<li>" . html::a($this->createLink('projectstory', 'story', "productID=0"), $lang->product->all)  . "</li>";
         foreach($projectProducts as $product)
         {
             echo "<li>" . html::a($this->createLink('projectstory', 'story', "productID=$product->id&branch=0&browseType=$browseType"), $product->name, '', "title='{$product->name}' class='text-ellipsis'") . "</li>";
diff --git a/module/projectstory/control.php b/module/projectstory/control.php
index ace37abee9..dd9714f268 100644
--- a/module/projectstory/control.php
+++ b/module/projectstory/control.php
@@ -44,8 +44,7 @@ class projectStory extends control
      */
     public function story($productID = 0, $branch = 0, $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        $this->session->set('storyList',$this->app->getURI(true));
-        if(empty($productID)) $productID = key($this->products);
+        $this->session->set('storyList', $this->app->getURI(true));
 
         $this->lang->menugroup->product       = 'projectstory';
 
diff --git a/module/story/model.php b/module/story/model.php
index c14d43ea30..d9c7db408a 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2313,7 +2313,7 @@ class storyModel extends model
         $type = strtolower($type);
         if($type == 'bysearch')
         {
-            if($this->app->rawModule == 'projectstory') $this->session->PRJStoryQuery = $this->session->storyQuery;
+            if($this->app->rawModule == 'projectstory') $this->session->executionStoryQuery = $this->session->storyQuery;
             $queryID  = (int)$param;
             $products = $this->loadModel('execution')->getProducts($executionID);
 
@@ -2373,8 +2373,8 @@ class storyModel extends model
                 ->andWhere('t2.type')->eq($storyType)
                 ->beginIF($excludeStories)->andWhere('t2.id')->notIN($excludeStories)->fi()
                 ->beginIF($execution->type == 'project')
-                ->andWhere('t1.product')->eq($productID)
-                ->beginIF(!empty($branch))->andWhere('t2.branch')->eq($branch)->fi()
+                ->beginIF(!empty($productID))->andWhere('t1.product')->eq($productID)
+                ->andWhere('t2.branch')->eq($branch)->fi()
                 ->beginIF(isset($statusFeatureList) and in_array($type, array_keys($statusFeatureList)))->andWhere('t2.status')->eq($type)->fi()
                 ->beginIF(isset($otherFeatureList) and in_array($type, array_keys($otherFeatureList)))->andWhere('t2.' . substr($type, 0, -2))->eq($this->app->user->account)->fi()
                 ->beginIF($type == 'unclosed')->andWhere('t2.status')->in(array_keys($unclosedStatus))->fi()
diff --git a/module/tree/model.php b/module/tree/model.php
index dc77e215a2..2a294a9f47 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -611,7 +611,7 @@ class treeModel extends model
      * @access public
      * @return string
      */
-    public function getProjectStoryTreeMenu($rootID, $startModule = 0, $userFunc)
+    public function getExecutionStoryTreeMenu($rootID, $startModule = 0, $userFunc)
     {
         $extra['executionID'] = $rootID;
         $menu = "<ul id='modules' class='tree' data-ride='tree' data-name='tree-story'>";
@@ -636,7 +636,9 @@ class treeModel extends model
         foreach($products as $id => $product)
         {
             $extra['productID'] = $id;
-            $link  = helper::createLink('execution', 'story', "executionID=$rootID&ordery=&status=byProduct&praram=$id");
+            $projectProductLink   = helper::createLink('projectstory', 'story', "productID=$id");
+            $executionProductLink = helper::createLink('execution', 'story', "executionID=$rootID&ordery=&status=byProduct&praram=$id");
+            $link = $this->app->rawModule == 'projectstory' ? $projectProductLink : $executionProductLink;
             if($productNum > 1) $menu .= "<li>" . html::a($link, $product, '_self', "id='product$id'");
 
             /* tree menu. */
@@ -656,13 +658,15 @@ class treeModel extends model
                 $stmt = $this->dbh->query($query);
                 while($module = $stmt->fetch())
                 {
-                    /* if not manage, ignore unused modules. */
+                    /* If not manage, ignore unused modules. */
                     if(isset($executionModules[$module->id])) $this->buildTree($treeMenu, $module, 'task', $userFunc, $extra);
                 }
                 if((isset($treeMenu[0]) and $branch) or isset($executionBranches[$branch]))
                 {
                     $childMenu = isset($treeMenu[0]) ? "<ul>{$treeMenu[0]}</ul>" : '';
-                    $link      = helper::createLink('execution', 'story', "executionID=$rootID&ordery=&status=byBranch&praram=" . (empty($branch) ? "{$id},0" : $branch));
+                    $projectBranchLink   = helper::createLink('projectstory', 'story', "productID=$id&branch=" . (empty($branch) ? 0 : $branch) . "&browseType=byBranch");
+                    $executionBranchLink = helper::createLink('execution', 'story', "executionID=$rootID&ordery=&status=byBranch&praram=" . (empty($branch) ? "{$id},0" : $branch));
+                    $link = $this->app->rawModule == 'projectstory' ? $projectBranchLink : $executionBranchLink;
                     if($branchName) $treeMenu[0] = "<li>" . html::a($link, $branchName, '_self', "id='branch" . (empty($branch) ? "{$id}_0" : $branch) . "'") . "{$childMenu}</li>";
                 }
                 $tree .= isset($treeMenu[0]) ? $treeMenu[0] : '';
@@ -866,6 +870,21 @@ class treeModel extends model
         return html::a(helper::createLink('execution', 'task', "executionID={$executionID}&type=byModule&param={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
     }
 
+    /**
+     * Create link of project story.
+     *
+     * @param  string $type
+     * @param  object $module
+     * @param  array  $extra
+     * @access public
+     * @return string
+     */
+    public function createProjectStoryLink($type, $module, $extra)
+    {
+        $productID = $extra['productID'];
+        return html::a(helper::createLink('projectstory', 'story', "productID=$productID&branch=&browseType=byModule&param={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
+    }
+
     /**
      * Create link of execution story.
      *

From 37800181deefd46d4260eab1f7f5910faa851409 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Wed, 10 Mar 2021 10:25:11 +0800
Subject: [PATCH 09/16] * Fix bug.

---
 module/project/view/ajaxgetdropmenu.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index de7693255a..867bcd8bd7 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -50,7 +50,7 @@ foreach($projects as $project)
     ?>
     </div>
     <div class="col-footer">
-      <?php echo html::a(helper::createLink('project', 'all'), '<i class="icon icon-cards-view muted"></i> ' . $lang->project->all, '', 'class="not-list-item"'); ?>
+      <?php echo html::a(helper::createLink('project', 'browse'), '<i class="icon icon-cards-view muted"></i> ' . $lang->project->all, '', 'class="not-list-item"'); ?>
       <a class='pull-right toggle-right-col not-list-item'><?php echo $lang->project->doneProjects?><i class='icon icon-angle-right'></i></a>
     </div>
   </div>

From 4bd1ec2cebf2cecdcd19dd6f5e391c4653528607 Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Wed, 10 Mar 2021 10:31:55 +0800
Subject: [PATCH 10/16] * Fix a bug.

---
 module/qa/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/qa/control.php b/module/qa/control.php
index f210bc305d..6acc7f40b8 100644
--- a/module/qa/control.php
+++ b/module/qa/control.php
@@ -30,7 +30,7 @@ class qa extends control
         parent::__construct();
 
         /* Set report menu group. */
-        $this->projectID = isset($_GET['project']) ? $_GET['project'] : 0;
+        $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
         if(!$this->projectID)
         {
             foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';

From eb6ddcaff05c9fd67fbe6c372485207f860a6b93 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Wed, 10 Mar 2021 10:36:42 +0800
Subject: [PATCH 11/16]  * Finish task #36451.

---
 module/index/js/index.js   |  2 +-
 module/my/lang/de.php      |  6 +++---
 module/my/lang/en.php      |  8 ++++----
 module/my/lang/fr.php      |  6 +++---
 module/my/lang/vi.php      |  6 +++---
 module/my/lang/zh-cn.php   |  6 +++---
 module/project/control.php | 14 ++++++++++++++
 7 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/module/index/js/index.js b/module/index/js/index.js
index 3ea5f24731..e6cb0f484d 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -100,7 +100,7 @@
         }
         if(moduleName === 'execution' && methodLowerCase === 'all')
         {
-            return link.params.from == 'project' ? 'project' : 'execution';
+            return (link.params.from || link.params.$3) == 'project' ? 'project' : 'execution';
         }
         if(['repo', 'jenkins', 'job', 'compile'].includes(moduleName))
         {
diff --git a/module/my/lang/de.php b/module/my/lang/de.php
index 96a3191569..147330e157 100644
--- a/module/my/lang/de.php
+++ b/module/my/lang/de.php
@@ -94,6 +94,6 @@ $lang->my->productLinkList['product-browse']    = 'By default, go to the list of
 global $config;
 $lang->my->projectLinkList = array();
 //$lang->my->projectLinkList['project-home'] = 'The default access to the project home page, you can understand the overall project status of the company';
-$lang->my->projectLinkList['project-browse'] = 'By default, you go to the project list, where you can view all the projects';
-$lang->my->projectLinkList['project-task']   = 'By default, you go to the task list for the most recent project iteration to see the task information for the current iteration';
-if($config->systemMode == 'new') $lang->my->projectLinkList['program-index'] = 'By default, go to the most recent project dashboard to see the current project overview';
+$lang->my->projectLinkList['project-browse']    = 'By default, you go to the project list, where you can view all the projects';
+$lang->my->projectLinkList['project-execution'] = 'Go to Project-Exection by default. You can check all information in Execution';
+if($config->systemMode == 'new') $lang->my->projectLinkList['project-index'] = 'By default, go to the most recent project dashboard to see the current project overview';
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index 447f39eeef..73170e6215 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -76,7 +76,7 @@ $lang->my->form->lblContact = 'Contact Info';
 $lang->my->form->lblAccount = 'Account Info';
 
 $lang->my->programLink = 'Program Default Page';
-$lang->my->productLink = 'Product Default Page'; 
+$lang->my->productLink = 'Product Default Page';
 $lang->my->projectLink = 'Project Default Page';
 
 $lang->my->programLinkList = array();
@@ -94,6 +94,6 @@ $lang->my->productLinkList['product-browse']    = 'By default, go to the list of
 global $config;
 $lang->my->projectLinkList = array();
 //$lang->my->projectLinkList['project-home'] = 'The default access to the project home page, you can understand the overall project status of the company';
-$lang->my->projectLinkList['project-browse'] = 'By default, you go to the project list, where you can view all the projects';
-$lang->my->projectLinkList['project-task']   = 'By default, you go to the task list for the most recent project iteration to see the task information for the current iteration';
-if($config->systemMode == 'new') $lang->my->projectLinkList['program-index']     = 'By default, go to the most recent project dashboard to see the current project overview';
+$lang->my->projectLinkList['project-browse']    = 'By default, you go to the project list, where you can view all the projects';
+$lang->my->projectLinkList['project-execution'] = 'Go to Project-Exection by default. You can check all information in Execution';
+if($config->systemMode == 'new') $lang->my->projectLinkList['project-index'] = 'By default, go to the most recent project dashboard to see the current project overview';
diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php
index 88f5d5a6ed..d8d184a867 100644
--- a/module/my/lang/fr.php
+++ b/module/my/lang/fr.php
@@ -94,6 +94,6 @@ $lang->my->productLinkList['product-browse']    = 'By default, go to the list of
 global $config;
 $lang->my->projectLinkList = array();
 //$lang->my->projectLinkList['project-home'] = 'The default access to the project home page, you can understand the overall project status of the company';
-$lang->my->projectLinkList['project-browse'] = 'By default, you go to the project list, where you can view all the projects';
-$lang->my->projectLinkList['project-task']   = 'By default, you go to the task list for the most recent project iteration to see the task information for the current iteration';
-if($config->systemMode == 'new') $lang->my->projectLinkList['program-index'] = 'By default, go to the most recent project dashboard to see the current project overview';
+$lang->my->projectLinkList['project-browse']    = 'By default, you go to the project list, where you can view all the projects';
+$lang->my->projectLinkList['project-execution'] = 'Go to Project-Exection by default. You can check all information in Execution';
+if($config->systemMode == 'new') $lang->my->projectLinkList['project-index'] = 'By default, go to the most recent project dashboard to see the current project overview';
diff --git a/module/my/lang/vi.php b/module/my/lang/vi.php
index 3273bef746..4058084793 100644
--- a/module/my/lang/vi.php
+++ b/module/my/lang/vi.php
@@ -94,6 +94,6 @@ $lang->my->productLinkList['product-browse']    = 'By default, go to the list of
 global $config;
 $lang->my->projectLinkList = array();
 //$lang->my->projectLinkList['project-home'] = 'The default access to the project home page, you can understand the overall project status of the company';
-$lang->my->projectLinkList['project-browse'] = 'By default, you go to the project list, where you can view all the projects';
-$lang->my->projectLinkList['project-task']   = 'By default, you go to the task list for the most recent project iteration to see the task information for the current iteration';
-if($config->systemMode == 'new') $lang->my->projectLinkList['program-index'] = 'By default, go to the most recent project dashboard to see the current project overview';
+$lang->my->projectLinkList['project-browse']    = 'By default, you go to the project list, where you can view all the projects';
+$lang->my->projectLinkList['project-execution'] = 'Go to Project-Exection by default. You can check all information in Execution';
+if($config->systemMode == 'new') $lang->my->projectLinkList['project-index'] = 'By default, go to the most recent project dashboard to see the current project overview';
diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index cbd955797a..1c6ee84840 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -96,6 +96,6 @@ $lang->my->productLinkList['product-browse']    = '默认进入最近一个产
 global $config;
 $lang->my->projectLinkList = array();
 //$lang->my->projectLinkList['project-home'] = '默认进入项目主页，可以了解公司整体的项目状况';
-$lang->my->projectLinkList['project-browse'] = '默认进入项目列表，可以查看所有的项目';
-$lang->my->projectLinkList['project-task']   = '默认进入最近一个项目迭代的任务列表，可以查看当前迭代下的任务信息';
-if($config->systemMode == 'new') $lang->my->projectLinkList['program-index'] = '默认进入最近一个项目仪表盘，可以查看当前项目概况';
+$lang->my->projectLinkList['project-browse']    = '默认进入项目列表，可以查看所有的项目';
+$lang->my->projectLinkList['project-execution'] = '默认进入项目下所有执行列表，查看所有执行信息';
+if($config->systemMode == 'new') $lang->my->projectLinkList['project-index'] = '默认进入最近一个项目仪表盘，可以查看当前项目概况';
diff --git a/module/project/control.php b/module/project/control.php
index a3573de746..dfdd8422ae 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -642,6 +642,20 @@ class project extends control
         $this->display();
     }
 
+    /**
+     * Execution list.
+     *
+     * @access public
+     * @return void
+     */
+    public function execution()
+    {
+        $PRJ = $this->session->PRJ;
+        if(!$PRJ) $PRJ = current(explode(',', $this->app->user->view->projects));
+
+        $this->locate($this->createLink('execution', 'all', "status=all&executionID=0&from=project", '', false, $PRJ));
+    }
+
     /**
      * Project manage view.
      *

From 4be2d39fc47b8759a77625278ee4926481943899 Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Wed, 10 Mar 2021 10:37:14 +0800
Subject: [PATCH 12/16] * Fix a bug.

---
 module/bug/control.php        | 2 +-
 module/caselib/control.php    | 2 +-
 module/testcase/control.php   | 2 +-
 module/testreport/control.php | 2 +-
 module/testsuite/control.php  | 2 +-
 module/testtask/control.php   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index d7446de714..6e6348c587 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -47,7 +47,7 @@ class bug extends control
         $this->loadModel('task');
 
         /* Set bug menu group. */
-        $this->projectID = isset($_GET['project']) ? $_GET['project'] : 0;
+        $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
         if(!$this->projectID)
         {
             $this->app->loadConfig('qa');
diff --git a/module/caselib/control.php b/module/caselib/control.php
index 9ae755c498..3795d7bd97 100644
--- a/module/caselib/control.php
+++ b/module/caselib/control.php
@@ -32,7 +32,7 @@ class caselib extends control
         parent::__construct($moduleName, $methodName);
 
         /* Set testtask menu group. */
-        $this->projectID = isset($_GET['project']) ? $_GET['project'] : 0;
+        $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
         if(!$this->projectID)
         {
             $this->app->loadConfig('qa');
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 788439648e..29bf802202 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -41,7 +41,7 @@ class testcase extends control
         $this->loadModel('user');
 
         /* Set test case menu group. */
-        $this->projectID = isset($_GET['project']) ? $_GET['project'] : 0;
+        $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
         if(!$this->projectID)
         {
             $this->app->loadConfig('qa');
diff --git a/module/testreport/control.php b/module/testreport/control.php
index 35b61ff0f5..9c19c3a3d5 100644
--- a/module/testreport/control.php
+++ b/module/testreport/control.php
@@ -37,7 +37,7 @@ class testreport extends control
         $this->app->loadLang('report');
 
         /* Set testreport menu group. */
-        $this->projectID = isset($_GET['project']) ? $_GET['project'] : 0;
+        $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
         if(!$this->projectID)
         {
             $this->app->loadConfig('qa');
diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index 845cae0030..e5748e0109 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -32,7 +32,7 @@ class testsuite extends control
        parent::__construct($moduleName, $methodName);
 
        /* Set testtask menu group. */
-       $this->projectID = isset($_GET['project']) ? $_GET['project'] : 0;
+       $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
        if(!$this->projectID)
        {
            $this->app->loadConfig('qa');
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 52fae1f206..8681a803a4 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -38,7 +38,7 @@ class testtask extends control
         parent::__construct($moduleName, $methodName);
 
         /* Set testtask menu group. */
-        $this->projectID = isset($_GET['project']) ? $_GET['project'] : 0;
+        $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
         if(!$this->projectID)
         {
             $this->app->loadConfig('qa');

From 1b471ee51969867e440d866c60bd0b278be58fa0 Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Wed, 10 Mar 2021 10:44:05 +0800
Subject: [PATCH 13/16] * Adjust the code.

---
 module/story/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/story/model.php b/module/story/model.php
index d9c7db408a..bb221ea74b 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2374,7 +2374,7 @@ class storyModel extends model
                 ->beginIF($excludeStories)->andWhere('t2.id')->notIN($excludeStories)->fi()
                 ->beginIF($execution->type == 'project')
                 ->beginIF(!empty($productID))->andWhere('t1.product')->eq($productID)
-                ->andWhere('t2.branch')->eq($branch)->fi()
+                ->andWhere('t2.branch')->eq($branch)
                 ->beginIF(isset($statusFeatureList) and in_array($type, array_keys($statusFeatureList)))->andWhere('t2.status')->eq($type)->fi()
                 ->beginIF(isset($otherFeatureList) and in_array($type, array_keys($otherFeatureList)))->andWhere('t2.' . substr($type, 0, -2))->eq($this->app->user->account)->fi()
                 ->beginIF($type == 'unclosed')->andWhere('t2.status')->in(array_keys($unclosedStatus))->fi()

From 05bcdae622ae07a8431806022a447e5e194d4a6b Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Wed, 10 Mar 2021 11:04:52 +0800
Subject: [PATCH 14/16] * Fix a bug.

---
 module/product/view/browse.html.php | 2 +-
 module/story/model.php              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 1982955bcc..7930134d2e 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -54,7 +54,7 @@ $isProjectStory = $this->app->rawModule == 'projectstory';
         echo "<li>" . html::a($this->createLink('projectstory', 'story', "productID=0"), $lang->product->all)  . "</li>";
         foreach($projectProducts as $product)
         {
-            echo "<li>" . html::a($this->createLink('projectstory', 'story', "productID=$product->id&branch=0&browseType=$browseType"), $product->name, '', "title='{$product->name}' class='text-ellipsis'") . "</li>";
+            echo "<li>" . html::a($this->createLink('projectstory', 'story', "productID=$product->id&branch=0"), $product->name, '', "title='{$product->name}' class='text-ellipsis'") . "</li>";
         }
         ?>
       </ul>
diff --git a/module/story/model.php b/module/story/model.php
index bb221ea74b..5097a7d8d8 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2374,7 +2374,7 @@ class storyModel extends model
                 ->beginIF($excludeStories)->andWhere('t2.id')->notIN($excludeStories)->fi()
                 ->beginIF($execution->type == 'project')
                 ->beginIF(!empty($productID))->andWhere('t1.product')->eq($productID)
-                ->andWhere('t2.branch')->eq($branch)
+                ->beginIF($type == 'bybranch')->andWhere('t2.branch')->eq($branch)->fi()
                 ->beginIF(isset($statusFeatureList) and in_array($type, array_keys($statusFeatureList)))->andWhere('t2.status')->eq($type)->fi()
                 ->beginIF(isset($otherFeatureList) and in_array($type, array_keys($otherFeatureList)))->andWhere('t2.' . substr($type, 0, -2))->eq($this->app->user->account)->fi()
                 ->beginIF($type == 'unclosed')->andWhere('t2.status')->in(array_keys($unclosedStatus))->fi()

From 940d9cbed30a4cfffcb9e98af9512993bdfe1265 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Wed, 10 Mar 2021 11:16:49 +0800
Subject: [PATCH 15/16]  * Fix get dynamic error.

---
 module/action/model.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/action/model.php b/module/action/model.php
index 0adedc0c5a..ed30c6d03b 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -640,7 +640,7 @@ class actionModel extends model
      * @param  string $orderBy
      * @param  object $pager
      * @param  string|int $productID   all|int(like 123)|notzero   all => include zero, notzero, greater than 0
-     * @param  string|int $executionID same as productID
+     * @param  string|int $projectID same as productID
      * @param  string $date
      * @param  string $direction
      * @access public
@@ -657,14 +657,14 @@ class actionModel extends model
         if($productID == 'all') $products = $this->app->user->view->products;
         if($projectID == 'all') $projects = $this->app->user->view->projects;
 
-        if($productID == 'all' or $executionID == 'all')
+        if($productID == 'all' or $projectID == 'all')
         {
-            $projectCondition = $projectID == 'all' ? "project " . helper::dbIN($projects) : '';
+            $projectCondition = $projectID == 'all' ? "execution " . helper::dbIN($projects) : '';
             $productCondition = $productID == 'all' ? "INSTR('," . $products . ",', product) > 0" : '';
             if(is_numeric($productID)) $productCondition = "product like'%,$productID,%' or product='$productID'";
-            if(is_numeric($projectID)) $projectCondition = "project='$projectID'";
+            if(is_numeric($projectID)) $projectCondition = "execution='$projectID'";
 
-            $condition = "(product =',0,' AND project = '0')";
+            $condition = "(product =',0,' AND execution = '0')";
             if($projectCondition) $condition .= ' OR ' . $projectCondition;
             if($productCondition) $condition .= ' OR ' . $productCondition;
             if($this->app->user->admin) $condition = 1;

From 9af18d203ff8f2a9c6e0205493d91cb8eb7705c1 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Wed, 10 Mar 2021 11:23:54 +0800
Subject: [PATCH 16/16] * Code for task #36436.

---
 module/common/lang/de.php        | 23 ++++++++++++-------
 module/common/lang/en.php        | 24 ++++++++++----------
 module/common/lang/fr.php        |  5 ++--
 module/common/lang/menuOrder.php |  7 +++---
 module/common/lang/vi.php        | 21 ++++++++++-------
 module/common/lang/zh-cn.php     | 39 ++++++++++++++++----------------
 module/company/control.php       |  6 -----
 module/custom/control.php        |  4 ++--
 module/execution/control.php     |  4 ++--
 module/execution/model.php       | 18 +++++++--------
 module/index/js/index.js         |  7 +-----
 11 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 600abec13f..071f3ef16a 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -219,10 +219,9 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->team     = array('link' => 'Team|my|team|', 'subModule' => 'user');
+$lang->system->menu->company  = array('link' => 'User|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
+$lang->system->menu->team     = array('link' => 'Team|my|team|');
 $lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
-$lang->system->menu->dynamic  = 'Dynamic|company|dynamic|';
-$lang->system->menu->view     = array('link' => 'Company|company|view');
 
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
@@ -513,15 +512,23 @@ $lang->company->menu = new stdclass();
 $lang->company->menu->browseUser  = array('link' => 'Benutzer|company|browse', 'subModule' => 'user');
 $lang->company->menu->dept        = array('link' => 'Abteilung|dept|browse', 'subModule' => 'dept');
 $lang->company->menu->browseGroup = array('link' => 'Gruppen|group|browse', 'subModule' => 'group');
+$lang->company->menu->dynamic     = 'Dynamic|company|dynamic|';
+$lang->company->menu->view        = array('link' => 'Company|company|view');
 
 /* Admin menu settings. */
 $lang->admin = new stdclass();
 $lang->admin->menu = new stdclass();
-$lang->admin->menu->index   = array('link' => 'Home|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
-$lang->admin->menu->company = array('link' => 'Personnel|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
-$lang->admin->menu->message = array('link' => 'Notification|message|index', 'subModule' => 'message,mail,webhook');
-$lang->admin->menu->custom  = array('link' => 'Custom|custom|index', 'subModule' => 'custom');
-$lang->admin->menu->system  = array('link' => 'System|backup|index', 'subModule' => 'cron,admin,backup,action');
+$lang->admin->menu->index     = array('link' => 'Home|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
+$lang->admin->menu->model     = array('link' => 'Model|custom|browsestoryconcept|', 'subModule' => 'holiday');
+$lang->admin->menu->custom    = array('link' => 'Custom|custom|index', 'subModule' => 'custom');
+$lang->admin->menu->extension = array('link' => 'Extension|extension|browse', 'subModule' => 'extension');
+$lang->admin->menu->dev       = array('link' => 'Develop|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor,entry');
+$lang->admin->menu->message   = array('link' => 'Message|message|index', 'subModule' => 'message,mail,webhook');
+$lang->admin->menu->system    = array('link' => 'System|backup|index', 'subModule' => 'cron,backup,action');
+
+$lang->subject = new stdclass();
+$lang->subject->menu = new stdclass();
+$lang->subject->menu->storyConcept = array('link' => 'Story Concpet|custom|browsestoryconcept|');
 
 $lang->company->menu = $lang->company->menu;
 $lang->dept->menu    = $lang->company->menu;
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 1d16ce4860..fe0021813f 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -219,10 +219,9 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->team     = array('link' => 'Team|my|team|', 'subModule' => 'user');
+$lang->system->menu->company  = array('link' => 'User|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
+$lang->system->menu->team     = array('link' => 'Team|my|team|');
 $lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
-$lang->system->menu->dynamic  = 'Dynamic|company|dynamic|';
-$lang->system->menu->view     = array('link' => 'Company|company|view');
 
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
@@ -517,16 +516,17 @@ $lang->company->menu->browseGroup = array('link' => 'Group|group|browse', 'subMo
 /* Admin menu settings. */
 $lang->admin = new stdclass();
 $lang->admin->menu = new stdclass();
-$lang->admin->menu->index   = array('link' => 'Home|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
-$lang->admin->menu->company = array('link' => 'Personnel|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
-$lang->admin->menu->message = array('link' => 'Notification|message|index', 'subModule' => 'message,mail,webhook');
-$lang->admin->menu->custom  = array('link' => 'Custom|custom|index', 'subModule' => 'custom');
-$lang->admin->menu->system  = array('link' => 'System|backup|index', 'subModule' => 'cron,admin,backup,action');
+$lang->admin->menu->index     = array('link' => 'Home|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
+$lang->admin->menu->model     = array('link' => 'Model|custom|browsestoryconcept|', 'subModule' => 'holiday');
+$lang->admin->menu->custom    = array('link' => 'Custom|custom|index', 'subModule' => 'custom');
+$lang->admin->menu->extension = array('link' => 'Extension|extension|browse', 'subModule' => 'extension');
+$lang->admin->menu->dev       = array('link' => 'Develop|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor,entry');
+$lang->admin->menu->message   = array('link' => 'Message|message|index', 'subModule' => 'message,mail,webhook');
+$lang->admin->menu->system    = array('link' => 'System|backup|index', 'subModule' => 'cron,backup,action');
 
-$lang->company->menu = $lang->company->menu;
-$lang->dept->menu    = $lang->company->menu;
-$lang->group->menu   = $lang->company->menu;
-$lang->user->menu    = $lang->company->menu;
+$lang->subject = new stdclass();
+$lang->subject->menu = new stdclass();
+$lang->subject->menu->storyConcept = array('link' => 'Story Concpet|custom|browsestoryconcept|');
 
 $lang->admin->subMenu = new stdclass();
 $lang->admin->subMenu->message = new stdclass();
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 5fc3b7c015..25b63d908a 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -219,10 +219,9 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->team     = array('link' => 'Team|my|team|', 'subModule' => 'user');
+$lang->system->menu->company  = array('link' => 'User|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
+$lang->system->menu->team     = array('link' => 'Team|my|team|');
 $lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
-$lang->system->menu->dynamic  = 'Dynamic|company|dynamic|';
-$lang->system->menu->view     = array('link' => 'Company|company|view');
 
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index 34ebb1b60d..cf7f9d42aa 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -148,10 +148,9 @@ $lang->group->menuOrder       = $lang->company->menuOrder;
 $lang->user->menuOrder        = $lang->company->menuOrder;
 
 /* system menu order. */
-$lang->system->menuOrder[5]  = 'team';
-$lang->system->menuOrder[10] = 'calendar';
-$lang->system->menuOrder[15] = 'dynamic';
-$lang->system->menuOrder[20] = 'view';
+$lang->system->menuOrder[5]  = 'company';
+$lang->system->menuOrder[10] = 'team';
+$lang->system->menuOrder[15] = 'calendar';
 
 /* admin menu order. */
 $lang->admin->menuOrder[5]  = 'index';
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 128ae940d3..332e067a88 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -219,10 +219,9 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->team     = array('link' => 'Team|my|team|', 'subModule' => 'user');
+$lang->system->menu->company  = array('link' => 'User|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
+$lang->system->menu->team     = array('link' => 'Team|my|team|');
 $lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
-$lang->system->menu->dynamic  = 'Dynamic|company|dynamic|';
-$lang->system->menu->view     = array('link' => 'Company|company|view');
 
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
@@ -517,11 +516,17 @@ $lang->company->menu->browseGroup = array('link' => 'Phân quyền|group|browse'
 /* Admin menu settings. */
 $lang->admin = new stdclass();
 $lang->admin->menu = new stdclass();
-$lang->admin->menu->index   = array('link' => 'Home|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
-$lang->admin->menu->company = array('link' => 'Personnel|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
-$lang->admin->menu->message = array('link' => 'Thông báo|message|index', 'subModule' => 'message,mail,webhook');
-$lang->admin->menu->custom  = array('link' => 'Custom|custom|index', 'subModule' => 'custom');
-$lang->admin->menu->system  = array('link' => 'System|backup|index', 'subModule' => 'cron,admin,backup,action');
+$lang->admin->menu->index     = array('link' => 'Home|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
+$lang->admin->menu->model     = array('link' => 'Model|custom|browsestoryconcept|', 'subModule' => 'holiday');
+$lang->admin->menu->custom    = array('link' => 'Custom|custom|index', 'subModule' => 'custom');
+$lang->admin->menu->extension = array('link' => 'Extension|extension|browse', 'subModule' => 'extension');
+$lang->admin->menu->dev       = array('link' => 'Develop|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor,entry');
+$lang->admin->menu->message   = array('link' => 'Message|message|index', 'subModule' => 'message,mail,webhook');
+$lang->admin->menu->system    = array('link' => 'System|backup|index', 'subModule' => 'cron,backup,action');
+
+$lang->subject = new stdclass();
+$lang->subject->menu = new stdclass();
+$lang->subject->menu->storyConcept = array('link' => 'Story Concpet|custom|browsestoryconcept|');
 
 $lang->company->menu = $lang->company->menu;
 $lang->dept->menu    = $lang->company->menu;
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index c0b0704f52..9cf98d69f9 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -221,15 +221,9 @@ $lang->productplan->menu = $lang->product->menu;
 /* System menu. */
 $lang->system = new stdclass();
 $lang->system->menu = new stdclass();
-$lang->system->menu->team     = array('link' => '团队|my|team|', 'subModule' => 'user');
+$lang->system->menu->company  = array('link' => '人员|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
+$lang->system->menu->team     = array('link' => '团队|my|team|');
 $lang->system->menu->calendar = array('link' => '日程|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo');
-$lang->system->menu->dynamic  = '动态|company|dynamic|';
-$lang->system->menu->view     = array('link' => '公司|company|view');
-//$lang->system->menu->company  = array('link' => '全局设置|custom|browsestoryconcept|', 'subModule' => 'holiday');
-
-//$lang->subject = new stdclass();
-//$lang->subject->menu = new stdclass();
-//$lang->subject->menu->storyConcept = array('link' => '需求概念|custom|browsestoryconcept|');
 
 $lang->measurement = new stdclass();
 $lang->measurement->menu = new stdclass();
@@ -523,17 +517,24 @@ $lang->company->menu = new stdclass();
 $lang->company->menu->browseUser  = array('link' => '用户|company|browse', 'subModule' => ',user,');
 $lang->company->menu->dept        = array('link' => '部门|dept|browse', 'subModule' => 'dept');
 $lang->company->menu->browseGroup = array('link' => '权限|group|browse', 'subModule' => 'group');
+$lang->company->menu->dynamic     = '动态|company|dynamic|';
+$lang->company->menu->view        = array('link' => '公司|company|view');
 
 /* 后台管理菜单设置。*/
 $lang->admin = new stdclass();
 $lang->admin->menu = new stdclass();
-$lang->admin->menu->index   = array('link' => '首页|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
-$lang->admin->menu->company = array('link' => '人员|company|browse|', 'subModule' => ',user,dept,group,', 'alias' => ',dynamic,view,');
-$lang->admin->menu->message = array('link' => '通知|message|index', 'subModule' => 'message,mail,webhook');
-$lang->admin->menu->custom  = array('link' => '自定义|custom|index', 'subModule' => 'custom');
-$lang->admin->menu->system  = array('link' => '系统|backup|index', 'subModule' => 'cron,backup,action');
+$lang->admin->menu->index     = array('link' => '首页|admin|index', 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
+$lang->admin->menu->model     = array('link' => '模型|custom|browsestoryconcept|', 'subModule' => 'holiday');
+$lang->admin->menu->custom    = array('link' => '自定义|custom|index', 'subModule' => 'custom');
+$lang->admin->menu->extension = array('link' => '插件|extension|browse', 'subModule' => 'extension');
+$lang->admin->menu->dev       = array('link' => '二次开发|dev|api', 'alias' => 'db', 'subModule' => 'dev,editor,entry');
+$lang->admin->menu->message   = array('link' => '通知|message|index', 'subModule' => 'message,mail,webhook');
+$lang->admin->menu->system    = array('link' => '系统|backup|index', 'subModule' => 'cron,backup,action');
+
+$lang->subject = new stdclass();
+$lang->subject->menu = new stdclass();
+$lang->subject->menu->storyConcept = array('link' => '需求概念|custom|browsestoryconcept|');
 
-$lang->company->menu = $lang->company->menu;
 $lang->dept->menu    = $lang->company->menu;
 $lang->group->menu   = $lang->company->menu;
 $lang->user->menu    = $lang->company->menu;
@@ -665,9 +666,14 @@ $lang->navGroup->execution = 'execution';
 $lang->navGroup->task      = 'execution';
 $lang->navGroup->build     = 'execution';
 
+$lang->navGroup->company       = 'system';
 $lang->navGroup->sqlbuilder    = 'system';
 $lang->navGroup->auditcl       = 'system';
 $lang->navGroup->cmcl          = 'system';
+$lang->navGroup->user          = 'system';
+$lang->navGroup->group         = 'system';
+$lang->navGroup->dept          = 'system';
+$lang->navGroup->ldap          = 'system';
 $lang->navGroup->process       = 'system';
 $lang->navGroup->activity      = 'system';
 $lang->navGroup->zoutput       = 'system';
@@ -684,14 +690,9 @@ $lang->navGroup->overtime = 'attend';
 $lang->navGroup->lieu     = 'attend';
 
 $lang->navGroup->admin     = 'admin';
-$lang->navGroup->company   = 'admin';
-$lang->navGroup->dept      = 'admin';
-$lang->navGroup->ldap      = 'admin';
-$lang->navGroup->group     = 'admin';
 $lang->navGroup->webhook   = 'admin';
 $lang->navGroup->sms       = 'admin';
 $lang->navGroup->message   = 'admin';
-$lang->navGroup->user      = 'admin';
 $lang->navGroup->custom    = 'admin';
 $lang->navGroup->cron      = 'admin';
 $lang->navGroup->backup    = 'admin';
diff --git a/module/company/control.php b/module/company/control.php
index 7fb824c385..b1ab021140 100644
--- a/module/company/control.php
+++ b/module/company/control.php
@@ -147,9 +147,6 @@ class company extends control
      */
     public function view()
     {
-        $this->lang->navGroup->company = 'system';
-        $this->lang->noMenuModule[] = 'company';
-
         $this->company->setMenu();
         $this->view->title      = $this->lang->company->common . $this->lang->colon . $this->lang->company->view;
         $this->view->position[] = $this->lang->company->view;
@@ -170,9 +167,6 @@ class company extends control
      */
     public function dynamic($browseType = 'today', $param = '', $recTotal = 0, $date = '', $direction = 'next')
     {
-        $this->lang->navGroup->company = 'system';
-        $this->lang->noMenuModule[] = 'company';
-
         $this->company->setMenu();
         $this->app->loadLang('user');
         $this->app->loadLang('execution');
diff --git a/module/custom/control.php b/module/custom/control.php
index 7d4319e9f4..745cff8c90 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -350,8 +350,8 @@ class custom extends control
         /* Process menu.*/
         $this->app->loadLang('custom');
         $this->lang->custom->menu = $this->lang->subject->menu;
-        $this->lang->navGroup->custom = 'system';
-        $this->lang->system->menu->company['subModule'] .= ',custom';
+        $this->lang->navGroup->custom = 'admin';
+        $this->lang->admin->menu->model['subModule'] .= ',custom';
         $key = array_search('custom', $this->lang->noMenuModule);
         if($key !== false) unset($this->lang->noMenuModule[$key]);
 
diff --git a/module/execution/control.php b/module/execution/control.php
index bec99166b1..bf7085158e 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -472,8 +472,8 @@ class execution extends control
 
         $execution   = $this->commonAction($toExecution);
         $toExecution = $execution->id;
-        $branches  = $this->execution->getBranches($toExecution);
-        $tasks     = $this->execution->getTasks2Imported($toExecution, $branches);
+        $branches    = $this->execution->getBranches($toExecution);
+        $tasks       = $this->execution->getTasks2Imported($toExecution, $branches);
         $executions  = $this->execution->getsToImport(array_keys($tasks), $execution->type);
         unset($executions[$toExecution]);
         unset($tasks[$toExecution]);
diff --git a/module/execution/model.php b/module/execution/model.php
index ba48b246d8..18472a90ee 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1226,7 +1226,7 @@ class executionModel extends model
     public function getBranches($executionID)
     {
         $productBranchPairs = $this->dao->select('product, branch')->from(TABLE_PROJECTPRODUCT)
-            ->where('execution')->eq($executionID)
+            ->where('project')->eq($executionID)
             ->fetchPairs();
         $branches = $this->loadModel('branch')->getByProducts(array_keys($productBranchPairs));
         foreach($productBranchPairs as $product => $branch)
@@ -1274,7 +1274,7 @@ class executionModel extends model
      */
     public function getRelatedExecutions($executionID)
     {
-        $products = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('execution')->eq((int)$executionID)->fetchAll('product');
+        $products = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq((int)$executionID)->fetchAll('product');
         // $products   = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->fetchAll('product');
         if(!$products) return array();
         $products = array_keys($products);
@@ -1802,7 +1802,7 @@ class executionModel extends model
 
         /* Link stories. */
         $executionStories = $this->loadModel('story')->getExecutionStoryPairs($executionID);
-        $lastOrder      = (int)$this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('execution')->eq($executionID)->orderBy('order_desc')->limit(1)->fetch('order');
+        $lastOrder      = (int)$this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('project')->eq($executionID)->orderBy('order_desc')->limit(1)->fetch('order');
         foreach($stories as $storyID)
         {
             if(!isset($executionStories[$storyID]))
@@ -2025,7 +2025,7 @@ class executionModel extends model
 
         $this->loadModel('action');
         $versions      = $this->loadModel('story')->getVersions($stories);
-        $linkedStories = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('execution')->eq($executionID)->orderBy('order_desc')->fetchPairs('story', 'order');
+        $linkedStories = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('project')->eq($executionID)->orderBy('order_desc')->fetchPairs('story', 'order');
         $lastOrder     = reset($linkedStories);
         $statusPairs   = $this->dao->select('id, status')->from(TABLE_STORY)->where('id')->in(array_values($stories))->fetchPairs();
         foreach($stories as $key => $storyID)
@@ -2056,7 +2056,7 @@ class executionModel extends model
     public function linkStories($executionID)
     {
         $plans = $this->dao->select('plan,product')->from(TABLE_PROJECTPRODUCT)
-            ->where('execution')->eq($executionID)
+            ->where('project')->eq($executionID)
             ->fetchPairs('plan', 'product');
 
         $planStories  = array();
@@ -2106,13 +2106,13 @@ class executionModel extends model
             $executionStories = $this->dao->select('execution,story')->from(TABLE_PROJECTSTORY)->where('story')->eq($storyID)->andWhere('execution')->in(array_keys($executions))->fetchAll();
             if(!empty($executionStories)) die(js::alert($this->lang->execution->notAllowedUnlinkStory));
         }
-        $this->dao->delete()->from(TABLE_PROJECTSTORY)->where('execution')->eq($executionID)->andWhere('story')->eq($storyID)->limit(1)->exec();
+        $this->dao->delete()->from(TABLE_PROJECTSTORY)->where('project')->eq($executionID)->andWhere('story')->eq($storyID)->limit(1)->exec();
 
         $order   = 1;
-        $stories = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('execution')->eq($executionID)->orderBy('order')->fetchAll();
+        $stories = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('project')->eq($executionID)->orderBy('order')->fetchAll();
         foreach($stories as $executionstory)
         {
-            if($executionstory->order != $order) $this->dao->update(TABLE_PROJECTSTORY)->set('`order`')->eq($order)->where('execution')->eq($executionID)->andWhere('story')->eq($executionstory->story)->exec();
+            if($executionstory->order != $order) $this->dao->update(TABLE_PROJECTSTORY)->set('`order`')->eq($order)->where('project')->eq($executionID)->andWhere('story')->eq($executionstory->story)->exec();
             $order++;
         }
 
@@ -2305,7 +2305,7 @@ class executionModel extends model
 
         if($executionType == 'execution')
         {
-            $childSprints   = $this->dao->select('id')->from(TABLE_EXECUTION)->where('execution')->eq($execution->id)->andWhere('type')->in('stage,sprint')->andWhere('deleted')->eq('0')->fetchPairs();
+            $childSprints   = $this->dao->select('id')->from(TABLE_EXECUTION)->where('project')->eq($execution->id)->andWhere('type')->in('stage,sprint')->andWhere('deleted')->eq('0')->fetchPairs();
             $linkedProducts = $this->loadModel('product')->getProductPairsByExecution($execution->id);
 
             $this->loadModel('user')->updateUserView(array($executionID), 'execution', $changedAccounts);
diff --git a/module/index/js/index.js b/module/index/js/index.js
index 4bdb885f97..e116b0a209 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -75,10 +75,6 @@
             }
             return 'doc';
         }
-        if(moduleName === 'custom' && ['estimate', 'browsestoryconcept', 'configurescrum', 'setdefaultconcept'].includes(methodLowerCase))
-        {
-            return 'system';
-        }
         if(['caselib', 'testreport', 'testsuite', 'testtask', 'testcase', 'bug', 'qa'].includes(moduleName))
         {
             return link.prj ? 'project' : 'qa';
@@ -117,8 +113,7 @@
         {
             if(methodLowerCase === 'create' && (link.params.programID || link.params.$1)) return 'program';
         }
-        if(moduleName === 'my')      if(methodLowerCase === 'team' || methodLowerCase == 'calendar') return 'system';
-        if(moduleName === 'company') if(methodLowerCase === 'view' || methodLowerCase == 'dynamic') return 'system';
+        if(moduleName === 'my') if(methodLowerCase === 'team' || methodLowerCase == 'calendar') return 'system';
         if(moduleName === 'tree')
         {
             if(methodLowerCase === 'browse')