From a25fd822bdc08c75fb4ca74693753f4733a0af0c Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Mon, 14 Mar 2022 09:55:44 +0800
Subject: [PATCH] * Fix bug #20702,20698,20642.

---
 extension/lite/execution/ext/model/lite.php      | 2 +-
 extension/lite/story/ext/view/batchedit.html.php | 4 +---
 module/common/view/datatable.fix.html.php        | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/extension/lite/execution/ext/model/lite.php b/extension/lite/execution/ext/model/lite.php
index af0eb526da..3773fe3daa 100644
--- a/extension/lite/execution/ext/model/lite.php
+++ b/extension/lite/execution/ext/model/lite.php
@@ -116,7 +116,7 @@ public function getTRActions($currentMethod)
     $TRActions  = '';
     $TRActions .= "<div class='btn-group dropdown'>";
     $TRActions .= html::a(helper::createLink('execution', $subMenu->{$currentMethod}['method'], $subMenu->{$currentMethod}['vars']), "<i class='icon icon-" . $this->lang->execution->icons[$currentMethod]."'> </i>" . $subMenu->{$currentMethod}['name'], '', "class='btn btn-link'");
-    $TRActions .= "<button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
+    $TRActions .= "<button type='button' class='btn btn-link' data-toggle='dropdown'><span class='caret'></span></button>";
     $TRActions .= "<ul class='dropdown-menu pull-right'>";
     foreach($subMenu as $subKey => $subName)
     {
diff --git a/extension/lite/story/ext/view/batchedit.html.php b/extension/lite/story/ext/view/batchedit.html.php
index 930f4e2b97..12e67bf258 100644
--- a/extension/lite/story/ext/view/batchedit.html.php
+++ b/extension/lite/story/ext/view/batchedit.html.php
@@ -36,7 +36,6 @@
           <th class='c-pri'> <?php echo $lang->priAB;?></th>
           <th class='c-user'> <?php echo $lang->story->assignedTo;?></th>
           <th class='c-status'><?php echo $lang->story->status;?></th>
-          <th class='c-stage'> <?php echo $lang->story->stageAB;?></th>
           <th class='c-user-box'><?php echo $lang->story->closedBy;?></th>
           <th class='c-reason'> <?php echo $lang->story->closedReason;?></th>
           <th class='c-keywords'><?php echo $lang->story->keywords;?></th>
@@ -74,7 +73,6 @@
           <td><?php echo html::select("pris[$storyID]",     $priList, $story->pri, 'class=form-control');?></td>
           <td class='text-left'><?php echo html::select("assignedTo[$storyID]",     $users, $story->assignedTo, "class='form-control chosen'");?></td>
           <td class='story-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></td>
-          <td><?php echo html::select("stages[$storyID]", $stageList, $story->stage, 'class="form-control"' . ($story->status == 'draft' ? ' disabled="disabled"' : ''));?></td>
           <td class='text-left'><?php echo html::select("closedBys[$storyID]",     $users, $story->closedBy, "class='form-control" . ($story->status == 'closed' ? " chosen'" : "' disabled='disabled'"));?></td>
 
           <?php if($story->status == 'closed'):?>
@@ -103,7 +101,7 @@
       </tbody>
       <tfoot>
         <tr>
-          <td colspan='11' class='text-center form-actions'>
+          <td colspan='10' class='text-center form-actions'>
             <?php echo html::submitButton();?>
             <?php echo $this->app->tab == 'product' ? html::a($this->session->storyList, $lang->goback, '', "class='btn btn-back btn-wide'") : html::backButton();?>
           </td>
diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php
index e1bd84adf7..77a36004ed 100644
--- a/module/common/view/datatable.fix.html.php
+++ b/module/common/view/datatable.fix.html.php
@@ -98,7 +98,7 @@ $(function()
               <td class='w-150px'><?php echo $lang->datatable->showModule;?></td>
               <td><?php echo html::radio('showModule', $lang->datatable->showModuleList, isset($config->datatable->$datatableId->showModule) ? $config->datatable->$datatableId->showModule : '');?></td>
             </tr>
-            <?php if($app->moduleName == 'execution' and $app->methodName == 'task'):?>
+            <?php if($app->moduleName == 'execution' and $app->methodName == 'task' and $this->config->vision != 'lite'):?>
             <tr>
               <td><?php echo $lang->datatable->showAllModule;?></td>
               <td><?php echo html::radio('showAllModule', $lang->datatable->showAllModuleList, isset($config->execution->task->allModule) ? $config->execution->task->allModule : 0);?></td>