From abce7ba766ab4c79646ecbefccf285777d1fcc8c Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 8 Jul 2022 10:55:17 +0800
Subject: [PATCH 1/4] * Fix bug #24314.

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

diff --git a/module/product/control.php b/module/product/control.php
index 1108ea3e27..31991f072e 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -241,7 +241,7 @@ class product extends control
 
             $this->products  = $this->product->getProducts($projectID, 'all', '', false);
             $projectProducts = $this->product->getProducts($projectID);
-            $productPlans    = $this->execution->getPlans($projectProducts);
+            $productPlans    = $this->execution->getPlans($projectProducts, 'skipParent');
 
             if($browseType == 'bybranch') $param = $branchID;
             $stories = $this->story->getExecutionStories($projectID, $productID, $branchID, $sort, $browseType, $param, 'story', '', $pager);

From 6792048cfcf77bee2832c02ba2e2a20bab763954 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 8 Jul 2022 11:08:40 +0800
Subject: [PATCH 2/4] * Fix bug #24802.

---
 module/testcase/view/caseheader.html.php | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index 219c21962e..98f2357687 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -3,6 +3,9 @@
 <?php $currentModule = $isProjectApp ? 'project'  : 'testcase';?>
 <?php $currentMethod = $isProjectApp ? 'testcase' : 'browse';?>
 <?php $projectParam  = $isProjectApp ? "projectID={$this->session->project}&" : '';?>
+<?php if(common::checkNotCN()):?>
+<style> .btn-toolbar>.btn {margin-right: 3px !important;}</style>
+<?php endif;?>
 <?php if(!isset($branch)) $branch = 0;?>
 <?php if($config->global->flow == 'full'):?>
 <style>
@@ -147,7 +150,6 @@
     </div>
     <?php endif;?>
     <?php $initModule = isset($moduleID) ? (int)$moduleID : 0;?>
-    <?php if(!common::checkNotCN()):?>
     <div class='btn-group dropdown'>
       <?php
       $createTestcaseLink = $this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule");
@@ -177,24 +179,6 @@
       </ul>
       <?php endif;?>
     </div>
-    <?php else:?>
-    <div class='btn-group dropdown-hover'>
-      <?php
-      $link = common::hasPriv('testcase', 'create') ? $this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule") : '###';
-      $disabled = common::hasPriv('testcase', 'create') ? '' : "disabled";
-      echo html::a($link, "<i class='icon icon-plus'></i> {$lang->testcase->create} </span><span class='caret'>", '', "class='btn btn-primary $disabled' data-app={$this->app->tab}");
-      ?>
-      <ul class='dropdown-menu'>
-        <?php $disabled = common::hasPriv('testcase', 'batchCreate') ? '' : "class='disabled'";?>
-        <li <?php echo $disabled?>>
-        <?php
-        $batchLink = $this->createLink('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule");
-        echo "<li>" . html::a($batchLink, "<i class='icon icon-plus'></i> " . $lang->testcase->batchCreate, '', "data-app='{$this->app->tab}'") . "</li>";
-        ?>
-        </li>
-      </ul>
-    </div>
-    <?php endif;?>
     <?php if($this->app->rawMethod == 'browseunits' and (empty($productID) or common::canModify('product', $product))):?>
       <?php common::printLink('testtask', 'importUnitResult', "product=$productID", "<i class='icon icon-import'></i> " . $lang->testtask->importUnitResult, '', "class='btn btn-primary' data-app='{$this->app->tab}'");?>
     <?php endif;?>

From 9df309488770d6927ccaa78aadc15f3e4778e9e4 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 8 Jul 2022 11:32:17 +0800
Subject: [PATCH 3/4] * Troubleshooting Play Course 302 Network Issues.

---
 module/common/model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/common/model.php b/module/common/model.php
index 2152c742a6..57e9041feb 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -2417,7 +2417,8 @@ EOD;
           ($module == 'file' and strpos('|read|download|uploadimages|ajaxwopifiles|', "|{$method}|") !== false) or
           ($module == 'sso' and $method == 'login') or
           ($module == 'report' && $method == 'annualdata') or
-          ($module == 'traincourse' and $method == 'ajaxuploadlargefile'))
+          ($module == 'traincourse' and $method == 'ajaxuploadlargefile') or
+          ($module == 'traincourse' and $method == 'playvideo'))
         {
             return;
         }

From 3213065954ea3004d0e67593f871b87d79519499 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 8 Jul 2022 13:05:07 +0800
Subject: [PATCH 4/4] * Fix bug #24802.

---
 module/bug/view/browse.html.php | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index a6c5bae27a..49381e4a63 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -110,7 +110,6 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
       </ul>
     </div>
     <?php if(common::canModify('product', $product)):?>
-    <?php if(!common::checkNotCN()):?>
     <?php
       $createBugLink   = '';
       $batchCreateLink = '';
@@ -150,38 +149,6 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
       </ul>
       <?php endif;?>
     </div>
-    <?php else:?>
-    <div class='btn-group dropdown-hover'>
-      <?php
-      if(commonModel::isTutorialMode())
-      {
-          $wizardParams = helper::safe64Encode("productID=$productID&branch=$branch&extra=moduleID=$moduleID");
-          $link = $this->createLink('tutorial', 'wizard', "module=bug&method=create&params=$wizardParams");
-          echo html::a($link, "<i class='icon icon-plus'></i> {$lang->bug->create} </span><span class='caret'>", '', "class='btn btn-primary btn-bug-create'");
-      }
-      else
-      {
-          $link     = $this->createLink('bug', 'create', "productID=$productID&branch=$branch&extra=moduleID=$moduleID");
-          $disabled = '';
-          if(!common::hasPriv('bug', 'create'))
-          {
-              $link     = '###';
-              $disabled = "disabled";
-          }
-          echo html::a($link, "<i class='icon icon-plus'></i> {$lang->bug->create} </span><span class='caret'>", '', "class='btn btn-primary $disabled'");
-      }
-      ?>
-      <ul class='dropdown-menu'>
-        <?php $disabled = common::hasPriv('bug', 'batchCreate') ? '' : "class='disabled'";?>
-        <li <?php echo $disabled?>>
-        <?php
-          $batchLink = $this->createLink('bug', 'batchCreate', "productID=$productID&branch=$branch&executionID=0&moduleID=$moduleID");
-          echo "<li>" . html::a($batchLink, "<i class='icon icon-plus'></i> " . $lang->bug->batchCreate) . "</li>";
-        ?>
-        </li>
-      </ul>
-    </div>
-    <?php endif;?>
     <?php endif;?>
   </div>
   <?php endif;?>