From bc662c5a71ce0ef02cdbbaebc17695f9a4587a50 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Tue, 29 Aug 2023 10:24:33 +0800
Subject: [PATCH] * Code for task #101329.

---
 module/common/model.php                   |   8 +-
 module/common/view/datatable.fix.html.php |   9 +-
 module/product/css/browse.css             |   3 +-
 module/story/config.php                   |  33 ++-
 module/story/model.php                    | 243 +++++++++++-----------
 5 files changed, 163 insertions(+), 133 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index c3e2038a59..86a65eb0a6 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -1720,10 +1720,6 @@ EOF;
 
         global $app, $lang, $config;
 
-        /* Add data-app attribute. */
-        if(strpos($misc, 'data-app') === false) $misc .= ' data-app="' . $app->tab . '"';
-        if($onlyBody && strpos($misc, 'data-toggle') === false) $misc .= ' data-toggle="modal"';
-
         /* Judge the $method of $module clickable or not, default is clickable. */
         $clickable = true;
         if(is_bool($extraEnabled))
@@ -1742,6 +1738,10 @@ EOF;
             }
         }
 
+        /* Add data-app attribute. */
+        if(strpos($misc, 'data-app') === false) $misc .= ' data-app="' . $app->tab . '"';
+        if($onlyBody && strpos($misc, 'data-toggle') === false && $clickable) $misc .= ' data-toggle="modal"';
+
         /* Set module and method, then create link to it. */
         if(strtolower($module) == 'story'    and strtolower($method) == 'createcase') ($module = 'testcase') and ($method = 'create');
         if(strtolower($module) == 'bug'      and strtolower($method) == 'tostory')    ($module = 'story') and ($method = 'create');
diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php
index 02e8c04b9b..98f40baf4f 100644
--- a/module/common/view/datatable.fix.html.php
+++ b/module/common/view/datatable.fix.html.php
@@ -3,6 +3,11 @@
 <?php $datatableId   = $this->moduleName . ucfirst($this->methodName);?>
 <?php js::set('currentMethod', $this->app->rawMethod)?>
 <?php js::set('currentModule', $this->app->rawModule)?>
+<?php
+$showSwitchLink = true;
+if($currentModule == 'execution' && ($currentMethod == 'all' || $currentMethod == 'task')) $showSwitchLink = false;
+if($currentModule == 'product' && $currentMethod == 'browse') $showSwitchLink = false;
+?>
 
 <style>
 #setShowModule {margin-left: 30px;}
@@ -36,7 +41,9 @@ $(function()
             {
                 $dropmenu.append("<li><a href='<?php echo $this->createLink('datatable', 'ajaxCustom', 'id=' . $this->moduleName . '&method=' . $this->methodName)?>' data-toggle='modal' data-type='ajax'><?php echo $lang->datatable->custom?></a></li>");
             }
-            if(!(currentModule == 'execution' && (currentMethod == 'all' || currentMethod == 'task'))) $dropmenu.append("<li><a href='javascript:saveDatatableConfig(\"mode\", \"<?php echo $mode == 'table' ? 'datatable' : 'table';?>\", true);' id='switchToDatatable'><?php echo $mode == 'table' ? $lang->datatable->switchToDatatable : $lang->datatable->switchToTable;?></a></li>");
+            <?php if($showSwitchLink):?>
+            $dropmenu.append("<li><a href='javascript:saveDatatableConfig(\"mode\", \"<?php echo $mode == 'table' ? 'datatable' : 'table';?>\", true);' id='switchToDatatable'><?php echo $mode == 'table' ? $lang->datatable->switchToDatatable : $lang->datatable->switchToTable;?></a></li>");
+            <?php endif;?>
             $dropdown.append($dropmenu)
               .appendTo($btnToolbar)
               .on('shown.zui.dropdown', function(){$btnToolbar.closest('.table-header').css('z-index', 11);})
diff --git a/module/product/css/browse.css b/module/product/css/browse.css
index a28cb53550..f26266dfc6 100644
--- a/module/product/css/browse.css
+++ b/module/product/css/browse.css
@@ -18,7 +18,6 @@ a.removeModule {color: #ddd;}
 a.removeModule:hover {color: red;}
 
 .main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
-.table-footer {z-index: 1;}
 @-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;};}
 
 #batchUnlinkStoryTip .modal-body {padding-top: 10px; max-height: 400px; overflow: auto;}
@@ -34,3 +33,5 @@ a.removeModule:hover {color: red;}
 #linkStoryByPlan .modal-header {padding: 20px 0 10px 0; border-bottom: 0px}
 
 .dtable-cell[data-col="actions"] > .dtable-cell-content .c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #F4F5F7; margin: 0 4px 0 0;}
+.table-footer{z-index: 10}
+#dtable .scrollbar, .table-header.fixed-right {z-index: 11}
diff --git a/module/story/config.php b/module/story/config.php
index 533ec36d5e..27552e47e4 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -55,7 +55,7 @@ $config->story->excludeCheckFileds = ',uploadImage,category,reviewer,reviewDitto
 global $lang, $app;
 $config->story->datatable = new stdclass();
 
-$config->story->datatable->defaultField = array('id', 'title', 'pri', 'plan', 'status', 'estimate', 'reviewedBy', 'stage', 'assignedTo', 'actions');
+$config->story->datatable->defaultField = array('id', 'title', 'pri', 'plan', 'status', 'estimate', 'reviewedBy', 'stage', 'assignedTo', 'openedBy', 'openedDate', 'actions');
 
 $config->story->datatable->fieldList['id']['title']    = 'idAB';
 $config->story->datatable->fieldList['id']['fixed']    = 'left';
@@ -88,6 +88,7 @@ $config->story->datatable->fieldList['title']['iconRender']   = true;
 $config->story->datatable->fieldList['pri']['title']    = 'priAB';
 $config->story->datatable->fieldList['pri']['fixed']    = 'left';
 $config->story->datatable->fieldList['pri']['type']     = 'html';
+$config->story->datatable->fieldList['pri']['sortType'] = true;
 $config->story->datatable->fieldList['pri']['width']    = '40';
 $config->story->datatable->fieldList['pri']['required'] = 'no';
 $config->story->datatable->fieldList['pri']['name']     = $this->lang->story->pri;
@@ -96,6 +97,7 @@ $config->story->datatable->fieldList['plan']['title']      = 'planAB';
 $config->story->datatable->fieldList['plan']['fixed']      = 'no';
 $config->story->datatable->fieldList['plan']['width']      = '90';
 $config->story->datatable->fieldList['plan']['type']       = 'html';
+$config->story->datatable->fieldList['plan']['sortType']   = true;
 $config->story->datatable->fieldList['plan']['required']   = 'no';
 $config->story->datatable->fieldList['plan']['control']    = 'select';
 $config->story->datatable->fieldList['plan']['dataSource'] = array('module' => 'productplan', 'method' => 'getPairs', 'params' => '$productID');
@@ -104,140 +106,165 @@ $config->story->datatable->fieldList['status']['title']    = 'statusAB';
 $config->story->datatable->fieldList['status']['fixed']    = 'no';
 $config->story->datatable->fieldList['status']['width']    = '60';
 $config->story->datatable->fieldList['status']['type']     = 'html';
+$config->story->datatable->fieldList['status']['sortType'] = true;
 $config->story->datatable->fieldList['status']['required'] = 'no';
 
 $config->story->datatable->fieldList['openedBy']['title']    = 'openedByAB';
 $config->story->datatable->fieldList['openedBy']['fixed']    = 'no';
 $config->story->datatable->fieldList['openedBy']['type']     = 'user';
+$config->story->datatable->fieldList['openedBy']['sortType'] = true;
 $config->story->datatable->fieldList['openedBy']['width']    = '60';
 $config->story->datatable->fieldList['openedBy']['required'] = 'no';
 
 $config->story->datatable->fieldList['estimate']['title']    = 'estimateAB';
 $config->story->datatable->fieldList['estimate']['fixed']    = 'no';
+$config->story->datatable->fieldList['estimate']['sortType'] = true;
 $config->story->datatable->fieldList['estimate']['width']    = '50';
 $config->story->datatable->fieldList['estimate']['required'] = 'no';
 
 $config->story->datatable->fieldList['reviewer']['title']      = 'reviewedBy';
 $config->story->datatable->fieldList['reviewer']['type']       = 'html';
+$config->story->datatable->fieldList['reviewer']['sortType']   = true;
 $config->story->datatable->fieldList['reviewer']['control']    = 'multiple';
 $config->story->datatable->fieldList['reviewer']['dataSource'] = array('module' => 'story', 'method' => 'getStoriesReviewer', 'params' => '$productID');
 
 $config->story->datatable->fieldList['reviewedBy']['title']      = 'reviewedBy';
 $config->story->datatable->fieldList['reviewedBy']['fixed']      = 'no';
 $config->story->datatable->fieldList['reviewedBy']['type']       = 'user';
+$config->story->datatable->fieldList['reviewedBy']['sortType']   = true;
 $config->story->datatable->fieldList['reviewedBy']['width']      = '100';
 $config->story->datatable->fieldList['reviewedBy']['required']   = 'no';
 $config->story->datatable->fieldList['reviewedBy']['control']    = 'multiple';
 $config->story->datatable->fieldList['reviewedBy']['dataSource'] = array('module' => 'story', 'method' => 'getStoriesReviewer', 'params' => '$productID');
 
-
 $config->story->datatable->fieldList['reviewedDate']['title']    = 'reviewedDate';
 $config->story->datatable->fieldList['reviewedDate']['fixed']    = 'no';
 $config->story->datatable->fieldList['reviewedDate']['type']     = 'date';
+$config->story->datatable->fieldList['reviewedDate']['sortType'] = true;
 $config->story->datatable->fieldList['reviewedDate']['width']    = '90';
 $config->story->datatable->fieldList['reviewedDate']['required'] = 'no';
 
 $config->story->datatable->fieldList['stage']['title']    = 'stageAB';
 $config->story->datatable->fieldList['stage']['fixed']    = 'no';
 $config->story->datatable->fieldList['stage']['type']     = 'html';
+$config->story->datatable->fieldList['stage']['sortType'] = true;
 $config->story->datatable->fieldList['stage']['width']    = '85';
 $config->story->datatable->fieldList['stage']['required'] = 'no';
 
 $config->story->datatable->fieldList['assignedTo']['title']    = 'assignedTo';
 $config->story->datatable->fieldList['assignedTo']['fixed']    = 'no';
 $config->story->datatable->fieldList['assignedTo']['type']     = 'html';
+$config->story->datatable->fieldList['assignedTo']['sortType'] = true;
 $config->story->datatable->fieldList['assignedTo']['width']    = '90';
 $config->story->datatable->fieldList['assignedTo']['required'] = 'no';
 
 $config->story->datatable->fieldList['assignedDate']['title']    = 'assignedDate';
 $config->story->datatable->fieldList['assignedDate']['fixed']    = 'no';
 $config->story->datatable->fieldList['assignedDate']['type']     = 'date';
+$config->story->datatable->fieldList['assignedDate']['sortType'] = true;
 $config->story->datatable->fieldList['assignedDate']['width']    = '90';
 $config->story->datatable->fieldList['assignedDate']['required'] = 'no';
 
 $config->story->datatable->fieldList['product']['title']      = 'product';
+$config->story->datatable->fieldList['product']['type']       = 'html';
+$config->story->datatable->fieldList['product']['sortType']   = true;
 $config->story->datatable->fieldList['product']['control']    = 'hidden';
 $config->story->datatable->fieldList['product']['dataSource'] = array('module' => 'transfer', 'method' => 'getRelatedObjects', 'params' => 'story&product&id,name');
 
 $config->story->datatable->fieldList['branch']['title']      = 'branch';
 $config->story->datatable->fieldList['branch']['fixed']      = 'no';
 $config->story->datatable->fieldList['branch']['type']       = 'html';
+$config->story->datatable->fieldList['branch']['sortType']   = true;
 $config->story->datatable->fieldList['branch']['width']      = '100';
 $config->story->datatable->fieldList['branch']['required']   = 'no';
 $config->story->datatable->fieldList['branch']['control']    = 'select';
 $config->story->datatable->fieldList['branch']['dataSource'] = array('module' => 'branch', 'method' => 'getPairs', 'params' => '$productID&active');
 
 $config->story->datatable->fieldList['module']['title']      = 'module';
+$config->story->datatable->fieldList['module']['type']       = 'html';
+$config->story->datatable->fieldList['module']['sortType']   = true;
 $config->story->datatable->fieldList['module']['control']    = 'select';
 $config->story->datatable->fieldList['module']['dataSource'] = array('module' => 'tree', 'method' => 'getOptionMenu', 'params' => '$productID&story&0&all');
 
 $config->story->datatable->fieldList['keywords']['title']    = 'keywords';
 $config->story->datatable->fieldList['keywords']['fixed']    = 'no';
 $config->story->datatable->fieldList['keywords']['type']     = 'html';
+$config->story->datatable->fieldList['keywords']['sortType'] = true;
 $config->story->datatable->fieldList['keywords']['width']    = '100';
 $config->story->datatable->fieldList['keywords']['required'] = 'no';
 
 $config->story->datatable->fieldList['source']['title']    = 'source';
 $config->story->datatable->fieldList['source']['fixed']    = 'no';
 $config->story->datatable->fieldList['source']['type']     = 'html';
+$config->story->datatable->fieldList['source']['sortType'] = true;
 $config->story->datatable->fieldList['source']['width']    = '90';
 $config->story->datatable->fieldList['source']['required'] = 'no';
 
 $config->story->datatable->fieldList['sourceNote']['title']    = 'sourceNote';
 $config->story->datatable->fieldList['sourceNote']['fixed']    = 'no';
 $config->story->datatable->fieldList['sourceNote']['type']     = 'html';
+$config->story->datatable->fieldList['sourceNote']['sortType'] = true;
 $config->story->datatable->fieldList['sourceNote']['width']    = '90';
 $config->story->datatable->fieldList['sourceNote']['required'] = 'no';
 
 $config->story->datatable->fieldList['category']['title']    = 'category';
 $config->story->datatable->fieldList['category']['fixed']    = 'no';
 $config->story->datatable->fieldList['category']['type']     = 'html';
+$config->story->datatable->fieldList['category']['sortType'] = true;
 $config->story->datatable->fieldList['category']['width']    = '60';
 $config->story->datatable->fieldList['category']['required'] = 'no';
 
 $config->story->datatable->fieldList['openedDate']['title']    = 'openedDate';
 $config->story->datatable->fieldList['openedDate']['fixed']    = 'no';
 $config->story->datatable->fieldList['openedDate']['type']     = 'date';
+$config->story->datatable->fieldList['openedDate']['sortType'] = true;
 $config->story->datatable->fieldList['openedDate']['width']    = '90';
 $config->story->datatable->fieldList['openedDate']['required'] = 'no';
 
 $config->story->datatable->fieldList['needReview']['title']      = 'needReview';
+$config->story->datatable->fieldList['needReview']['type']       = 'html';
 $config->story->datatable->fieldList['needReview']['control']    = 'select';
 $config->story->datatable->fieldList['needReview']['dataSource'] = array('lang' => 'reviewList');
 
 $config->story->datatable->fieldList['closedBy']['title']    = 'closedBy';
 $config->story->datatable->fieldList['closedBy']['fixed']    = 'no';
 $config->story->datatable->fieldList['closedBy']['type']     = 'user';
+$config->story->datatable->fieldList['closedBy']['sortType'] = true;
 $config->story->datatable->fieldList['closedBy']['width']    = '80';
 $config->story->datatable->fieldList['closedBy']['required'] = 'no';
 
 $config->story->datatable->fieldList['closedDate']['title']    = 'closedDate';
 $config->story->datatable->fieldList['closedDate']['fixed']    = 'no';
 $config->story->datatable->fieldList['closedDate']['type']     = 'date';
+$config->story->datatable->fieldList['closedDate']['sortType'] = true;
 $config->story->datatable->fieldList['closedDate']['width']    = '90';
 $config->story->datatable->fieldList['closedDate']['required'] = 'no';
 
 $config->story->datatable->fieldList['closedReason']['title']    = 'closedReason';
 $config->story->datatable->fieldList['closedReason']['fixed']    = 'no';
 $config->story->datatable->fieldList['closedReason']['type']     = 'html';
+$config->story->datatable->fieldList['closedReason']['sortType'] = true;
 $config->story->datatable->fieldList['closedReason']['width']    = '90';
 $config->story->datatable->fieldList['closedReason']['required'] = 'no';
 
 $config->story->datatable->fieldList['lastEditedBy']['title']    = 'lastEditedBy';
 $config->story->datatable->fieldList['lastEditedBy']['fixed']    = 'no';
 $config->story->datatable->fieldList['lastEditedBy']['type']     = 'user';
+$config->story->datatable->fieldList['lastEditedBy']['sortType'] = true;
 $config->story->datatable->fieldList['lastEditedBy']['width']    = '80';
 $config->story->datatable->fieldList['lastEditedBy']['required'] = 'no';
 
 $config->story->datatable->fieldList['lastEditedDate']['title']    = 'lastEditedDate';
 $config->story->datatable->fieldList['lastEditedDate']['fixed']    = 'no';
 $config->story->datatable->fieldList['lastEditedDate']['type']     = 'date';
+$config->story->datatable->fieldList['lastEditedDate']['sortType'] = true;
 $config->story->datatable->fieldList['lastEditedDate']['width']    = '90';
 $config->story->datatable->fieldList['lastEditedDate']['required'] = 'no';
 
 $config->story->datatable->fieldList['activatedDate']['title']    = 'activatedDate';
 $config->story->datatable->fieldList['activatedDate']['fixed']    = 'no';
 $config->story->datatable->fieldList['activatedDate']['type']     = 'date';
+$config->story->datatable->fieldList['activatedDate']['sortType'] = true;
 $config->story->datatable->fieldList['activatedDate']['width']    = '90';
 $config->story->datatable->fieldList['activatedDate']['required'] = 'no';
 
@@ -256,12 +283,14 @@ $config->story->datatable->fieldList['notifyEmail']['required'] = 'no';
 $config->story->datatable->fieldList['mailto']['title']    = 'mailto';
 $config->story->datatable->fieldList['mailto']['fixed']    = 'no';
 $config->story->datatable->fieldList['mailto']['type']     = 'html';
+$config->story->datatable->fieldList['mailto']['sortType'] = true;
 $config->story->datatable->fieldList['mailto']['width']    = '100';
 $config->story->datatable->fieldList['mailto']['required'] = 'no';
 
 $config->story->datatable->fieldList['version']['title']    = 'version';
 $config->story->datatable->fieldList['version']['fixed']    = 'no';
 $config->story->datatable->fieldList['version']['type']     = 'html';
+$config->story->datatable->fieldList['version']['sortType'] = true;
 $config->story->datatable->fieldList['version']['width']    = '60';
 $config->story->datatable->fieldList['version']['required'] = 'no';
 
diff --git a/module/story/model.php b/module/story/model.php
index 139e6282ca..b25c7fe0d6 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4576,8 +4576,8 @@ class storyModel extends model
         $story->notReview = isset($story->notReview) ? $story->notReview : array();
         $isSuperReviewer = strpos(',' . trim(zget($config->story, 'superReviewers', ''), ',') . ',', ',' . $app->user->account . ',');
 
-        if($action == 'change')     return (($isSuperReviewer !== false or count($story->reviewer) == 0 or count($story->notReview) == 0) and $story->status == 'active');
-        if($action == 'review')     return (($isSuperReviewer !== false or in_array($app->user->account, $story->notReview)) and $story->status == 'reviewing');
+        if($action == 'change') return (($isSuperReviewer !== false or count($story->reviewer) == 0 or count($story->notReview) == 0) and $story->status == 'active');
+        if($action == 'review') return (($isSuperReviewer !== false or in_array($app->user->account, $story->notReview)) and $story->status == 'reviewing');
 
         return true;
     }
@@ -4599,126 +4599,121 @@ class storyModel extends model
 
         if($type == 'browse')
         {
-            if(common::canBeChanged('story', $story))
+            if(!common::canBeChanged('story', $story)) return $this->buildMenu('story', 'close', $params . "&from=&storyType=$story->type", $story, 'list', '', '', 'iframe', true);
+
+            $storyReviewer = isset($story->reviewer) ? $story->reviewer : array();
+            if($story->URChanged) return $this->buildMenu('story', 'processStoryChange', $params, $story, $type, 'ok', '', 'iframe', true, '', $this->lang->confirm);
+
+            $isClick = $this->isClickable($story, 'change');
+            $title   = $isClick ? '' : $this->lang->story->changeTip;
+            $menu   .= $this->buildMenu('story', 'change', $params . "&from=&storyType=$story->type", $story, $type, 'alter', '', 'showinonlybody', false, '', $title);
+
+            if($story->status != 'reviewing')
             {
-                $storyReviewer = isset($story->reviewer) ? $story->reviewer : array();
-                if($story->URChanged) return $this->buildMenu('story', 'processStoryChange', $params, $story, $type, 'ok', '', 'iframe', true, '', $this->lang->confirm);
-
-                $isClick = $this->isClickable($story, 'change');
-                $title   = $isClick ? '' : $this->lang->story->changeTip;
-                $menu   .= $this->buildMenu('story', 'change', $params . "&from=&storyType=$story->type", $story, $type, 'alter', '', 'showinonlybody', false, '', $title);
-
-                if($story->status != 'reviewing')
-                {
-                    $menu .= $this->buildMenu('story', 'submitReview', "storyID=$story->id&storyType=$story->type", $story, $type, 'confirm', '', 'iframe', true, "data-width='50%'");
-                }
-                else
-                {
-                    $isClick = $this->isClickable($story, 'review');
-                    $title   = $this->lang->story->review;
-                    if(!$isClick and $story->status != 'closed')
-                    {
-                        if($story->status == 'active')
-                        {
-                            $title = $this->lang->story->reviewTip['active'];
-                        }
-                        elseif($storyReviewer and in_array($this->app->user->account, $storyReviewer))
-                        {
-                            $title = $this->lang->story->reviewTip['reviewed'];
-                        }
-                        elseif($storyReviewer and !in_array($this->app->user->account, $storyReviewer))
-                        {
-                            $title = $this->lang->story->reviewTip['notReviewer'];
-                        }
-                    }
-                    $menu .= $this->buildMenu('story', 'review', $params . "&from=$story->from&storyType=$story->type", $story, $type, 'search', '', 'showinonlybody', false, '', $title);
-                }
-
-                $isClick = $this->isClickable($story, 'recall');
-                $title   = $story->status == 'changing' ? $this->lang->story->recallChange : $this->lang->story->recall;
-                $title   = $isClick ? $title : $this->lang->story->recallTip['actived'];
-                $menu   .= $this->buildMenu('story', 'recall', $params . "&from=list&confirm=no&storyType=$story->type", $story, $type, 'undo', 'hiddenwin', 'showinonlybody', false, '', $title);
-                $menu   .= $this->buildMenu('story', 'edit', $params . "&kanbanGroup=default&storyType=$story->type", $story, $type, '', '', 'showinonlybody');
-
-                $vars            = "storyType={$story->type}";
-                $canChange       = common::hasPriv('story', 'change', '', $vars);
-                $canRecall       = common::hasPriv('story', 'recall', '', $vars);
-                $canSubmitReview = (strpos('draft,changing', $story->status) !== false and common::hasPriv('story', 'submitReview', '', $vars));
-                $canReview       = (strpos('draft,changing', $story->status) === false and common::hasPriv('story', 'review', '', $vars));
-                $canEdit         = common::hasPriv('story', 'edit', '', $vars);
-                $canBatchCreate  = ($this->app->tab == 'product' and (common::hasPriv('story', 'batchCreate', '', 'storyType=story')));
-                $canCreateCase   = ($story->type == 'story' and common::hasPriv('testcase', 'create'));
-                $canClose        = common::hasPriv('story', 'close', '', $vars);
-                $canUnlinkStory  = ($this->app->tab == 'project' and common::hasPriv('projectstory', 'unlinkStory'));
-
-                if(in_array($this->app->tab, array('product', 'project')))
-                {
-                    if(($canChange or $canRecall or $canSubmitReview or $canReview or $canEdit) and ($canCreateCase or $canBatchCreate or $canClose or $canUnlinkStory))
-                    {
-                        $menu .= "<div class='dividing-line'></div>";
-                    }
-                }
-
-                if($this->app->tab == 'product' and $storyType == 'requirement')
-                {
-                    if($story->status != 'closed')
-                    {
-                        $menu .= $this->buildMenu('story', 'close', $params . "&from=&storyType=$story->type", $story, $type, '', '', 'iframe', true);
-                    }
-                    else
-                    {
-                        $menu .= $this->buildMenu('story', 'activate', $params . "&storyType=$story->type", $story, $type, '', '', 'iframe showinonlybody', true);
-                    }
-
-                    if($canClose and ($canBatchCreate or $canCreateCase)) $menu .= "<div class='dividing-line'></div>";
-                }
-
-                if($story->type != 'requirement' and $this->config->vision != 'lite') $menu .= $this->buildMenu('testcase', 'create', "productID=$story->product&branch=$story->branch&module=0&from=&param=0&$params", $story, $type, 'sitemap', '', 'iframe showinonlybody', true, "data-app='{$this->app->tab}'");
-
-                $shadow = $this->dao->findByID($story->product)->from(TABLE_PRODUCT)->fetch('shadow');
-                if($this->app->rawModule != 'projectstory' OR $this->config->vision == 'lite' OR $shadow OR $story->type == 'requirement')
-                {
-                    $isClick = $this->isClickable($story, 'batchcreate');
-                    $title   = $story->type == 'story' ? $this->lang->story->subdivideSR : $this->lang->story->subdivide;
-                    if(!$isClick and $story->status != 'closed')
-                    {
-                        if($story->parent > 0)
-                        {
-                            $title = $this->lang->story->subDivideTip['subStory'];
-                        }
-                        elseif(!empty($story->twins))
-                        {
-                            $title = $this->lang->story->subDivideTip['twinsSplit'];
-                        }
-                        else
-                        {
-                            if($story->status != 'active') $title = sprintf($this->lang->story->subDivideTip['notActive'], $story->type == 'story' ? $this->lang->SRCommon : $this->lang->URCommon);
-                            if($story->status == 'active' and $story->stage != 'wait') $title = sprintf($this->lang->story->subDivideTip['notWait'], zget($this->lang->story->stageList, $story->stage));
-                        }
-                    }
-
-                    $executionID = empty($execution) ? 0 : $execution->id;
-                    if($this->config->vision != 'or') $menu .= $this->buildMenu('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&$params&executionID=$executionID&plan=0&storyType=story", $story, $type, 'split', '', 'showinonlybody', '', '', $title);
-                }
-
-                if(($this->app->rawModule == 'projectstory' or ($this->app->tab != 'product' and $storyType == 'requirement')) and $this->config->vision != 'lite')
-                {
-                    if($canClose) $menu .= "<div class='dividing-line'></div>";
-
-                    $menu .= $this->buildMenu('story', 'close', $params . "&from=&storyType=$story->type", $story, $type, '', '', 'iframe', true);
-                    if(!empty($execution) and $execution->hasProduct and !($storyType == 'requirement' and $story->type == 'story')) $menu .= $this->buildMenu('projectstory', 'unlinkStory', "projectID={$this->session->project}&$params", $story, $type, 'unlink', 'hiddenwin', 'showinonlybody');
-                }
-
-                if($this->app->tab == 'product' and $storyType == 'story')
-                {
-                    if(($canBatchCreate or $canCreateCase) and $canClose) $menu .= "<div class='dividing-line'></div>";
-
-                    $menu .= $this->buildMenu('story', 'close', $params . "&from=&storyType=$story->type", $story, $type, '', '', 'iframe', true);
-                }
+                $menu .= $this->buildMenu('story', 'submitReview', "storyID=$story->id&storyType=$story->type", $story, $type, 'confirm', '', 'iframe', true, "data-width='50%'");
             }
             else
             {
-                return $this->buildMenu('story', 'close', $params . "&from=&storyType=$story->type", $story, 'list', '', '', 'iframe', true);
+                $isClick = $this->isClickable($story, 'review');
+                $title   = $this->lang->story->review;
+                if(!$isClick and $story->status != 'closed')
+                {
+                    if($story->status == 'active')
+                    {
+                        $title = $this->lang->story->reviewTip['active'];
+                    }
+                    elseif($storyReviewer and in_array($this->app->user->account, $storyReviewer))
+                    {
+                        $title = $this->lang->story->reviewTip['reviewed'];
+                    }
+                    elseif($storyReviewer and !in_array($this->app->user->account, $storyReviewer))
+                    {
+                        $title = $this->lang->story->reviewTip['notReviewer'];
+                    }
+                }
+                $menu .= $this->buildMenu('story', 'review', $params . "&from=&storyType=$story->type", $story, $type, 'search', '', 'showinonlybody', false, '', $title);
+            }
+
+            $isClick = $this->isClickable($story, 'recall');
+            $title   = $story->status == 'changing' ? $this->lang->story->recallChange : $this->lang->story->recall;
+            $title   = $isClick ? $title : $this->lang->story->recallTip['actived'];
+            $menu   .= $this->buildMenu('story', 'recall', $params . "&from=list&confirm=no&storyType=$story->type", $story, $type, 'undo', 'hiddenwin', 'showinonlybody', false, '', $title);
+            $menu   .= $this->buildMenu('story', 'edit', $params . "&kanbanGroup=default&storyType=$story->type", $story, $type, '', '', 'showinonlybody');
+
+            $vars            = "storyType={$story->type}";
+            $canChange       = common::hasPriv('story', 'change', '', $vars);
+            $canRecall       = common::hasPriv('story', 'recall', '', $vars);
+            $canSubmitReview = (strpos('draft,changing', $story->status) !== false and common::hasPriv('story', 'submitReview', '', $vars));
+            $canReview       = (strpos('draft,changing', $story->status) === false and common::hasPriv('story', 'review', '', $vars));
+            $canEdit         = common::hasPriv('story', 'edit', '', $vars);
+            $canBatchCreate  = ($this->app->tab == 'product' and (common::hasPriv('story', 'batchCreate', '', 'storyType=story')));
+            $canCreateCase   = ($story->type == 'story' and common::hasPriv('testcase', 'create'));
+            $canClose        = common::hasPriv('story', 'close', '', $vars);
+            $canUnlinkStory  = ($this->app->tab == 'project' and common::hasPriv('projectstory', 'unlinkStory'));
+
+            if(in_array($this->app->tab, array('product', 'project')))
+            {
+                if(($canChange or $canRecall or $canSubmitReview or $canReview or $canEdit) and ($canCreateCase or $canBatchCreate or $canClose or $canUnlinkStory))
+                {
+                    $menu .= "<div class='dividing-line'></div>";
+                }
+            }
+
+            if($this->app->tab == 'product' and $storyType == 'requirement')
+            {
+                if($story->status != 'closed')
+                {
+                    $menu .= $this->buildMenu('story', 'close', $params . "&from=&storyType=$story->type", $story, $type, '', '', 'iframe', true);
+                }
+                else
+                {
+                    $menu .= $this->buildMenu('story', 'activate', $params . "&storyType=$story->type", $story, $type, '', '', 'iframe showinonlybody', true);
+                }
+
+                if($canClose and ($canBatchCreate or $canCreateCase)) $menu .= "<div class='dividing-line'></div>";
+            }
+
+            if($story->type != 'requirement' and $this->config->vision != 'lite') $menu .= $this->buildMenu('testcase', 'create', "productID=$story->product&branch=$story->branch&module=0&from=&param=0&$params", $story, $type, 'sitemap', '', 'iframe showinonlybody', true, "data-app='{$this->app->tab}'");
+
+            $shadow = $this->dao->findByID($story->product)->from(TABLE_PRODUCT)->fetch('shadow');
+            if($this->app->rawModule != 'projectstory' OR $this->config->vision == 'lite' OR $shadow OR $story->type == 'requirement')
+            {
+                $isClick = $this->isClickable($story, 'batchcreate');
+                $title   = $story->type == 'story' ? $this->lang->story->subdivideSR : $this->lang->story->subdivide;
+                if(!$isClick and $story->status != 'closed')
+                {
+                    if($story->parent > 0)
+                    {
+                        $title = $this->lang->story->subDivideTip['subStory'];
+                    }
+                    elseif(!empty($story->twins))
+                    {
+                        $title = $this->lang->story->subDivideTip['twinsSplit'];
+                    }
+                    else
+                    {
+                        if($story->status != 'active') $title = sprintf($this->lang->story->subDivideTip['notActive'], $story->type == 'story' ? $this->lang->SRCommon : $this->lang->URCommon);
+                        if($story->status == 'active' and $story->stage != 'wait') $title = sprintf($this->lang->story->subDivideTip['notWait'], zget($this->lang->story->stageList, $story->stage));
+                    }
+                }
+
+                $executionID = empty($execution) ? 0 : $execution->id;
+                if($this->config->vision != 'or') $menu .= $this->buildMenu('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&$params&executionID=$executionID&plan=0&storyType=story", $story, $type, 'split', '', 'showinonlybody', '', '', $title);
+            }
+
+            if(($this->app->rawModule == 'projectstory' or ($this->app->tab != 'product' and $storyType == 'requirement')) and $this->config->vision != 'lite')
+            {
+                if($canClose) $menu .= "<div class='dividing-line'></div>";
+
+                $menu .= $this->buildMenu('story', 'close', $params . "&from=&storyType=$story->type", $story, $type, '', '', 'iframe', true);
+                if(!empty($execution) and $execution->hasProduct and !($storyType == 'requirement' and $story->type == 'story')) $menu .= $this->buildMenu('projectstory', 'unlinkStory', "projectID={$this->session->project}&$params", $story, $type, 'unlink', 'hiddenwin', 'showinonlybody');
+            }
+
+            if($this->app->tab == 'product' and $storyType == 'story')
+            {
+                if(($canBatchCreate or $canCreateCase) and $canClose) $menu .= "<div class='dividing-line'></div>";
+
+                $menu .= $this->buildMenu('story', 'close', $params . "&from=&storyType=$story->type", $story, $type, '', '', 'iframe', true);
             }
         }
 
@@ -5417,7 +5412,7 @@ class storyModel extends model
         $btnClass    .= $story->assignedTo == 'closed' ? ' disabled' : '';
         $btnClass    .= ' iframe btn btn-icon-left btn-sm';
         $assignToLink = helper::createLink('story', 'assignTo', "storyID=$story->id&kanbanGroup=default&from=&storyType=$story->type", '', true);
-        $assignToHtml = html::a($assignToLink, "<i class='icon icon-hand-right'></i> <span>{$assignedToText}</span>", '', "class='$btnClass'");
+        $assignToHtml = html::a($assignToLink, "<i class='icon icon-hand-right'></i> <span>{$assignedToText}</span>", '', "class='$btnClass' data-toggle='modal'");
         $assignToHtml = !common::hasPriv($story->type, 'assignTo', $story) ? "<span style='padding-left: 21px' class='$btnTextClass'>{$assignedToText}</span>" : $assignToHtml;
 
         if(!$print) return $assignToHtml;
@@ -6773,9 +6768,13 @@ class storyModel extends model
         if($this->config->vision == 'or') $this->app->loadLang('demand');
         foreach($stories as $story)
         {
+            $menuType = 'browse';
+            if(($tab == 'execution' || ($tab == 'project' and $this->session->multiple)) && $storyType == 'story') $menuType = 'execution';
+
             if(!empty($branchOptions)) $branches = zget($branchOptions, $story->product, array());
             $story->estimateNum  = $story->estimate;;
             $story->caseCountNum = zget($storyCases, $story->id, 0);
+            $story->actions      = '<div class="c-actions">' . $this->buildOperateMenu($story, $menuType, $execution, $storyType) . '</div>';
             foreach($cols as $col)
             {
                 if($col->name == 'assignedTo') $story->assignedTo = $this->printAssignedHtml($story, $users, false);
@@ -6849,12 +6848,6 @@ class storyModel extends model
                     $mailto = array_map(function($account) use($users){$account = trim($account); return zget($users, $account);}, explode(',', $story->mailto));
                     $story->mailto = implode(' ', $mailto);
                 }
-                if($col->name == 'actions')
-                {
-                    $menuType = 'browse';
-                    if(($tab == 'execution' || ($tab == 'project' and $this->session->multiple)) && $storyType == 'story') $menuType = 'execution';
-                    $story->actions = '<div class="c-actions">' . $this->buildOperateMenu($story, $menuType, $execution, $storyType) . '</div>';
-                }
                 if(in_array($col->name, $userFields)) $story->{$col->name} = zget($users, $story->{$col->name});
                 if(in_array($col->name, $dateFields)) $story->{$col->name} = helper::isZeroDate($story->{$col->name}) ? '' : substr($story->{$col->name}, 5, 11);
             }