From 600fd531319424356af7e09cc830aa1fd774f7f4 Mon Sep 17 00:00:00 2001
From: qiyu-xie <xieqiyu@easycorp.ltd>
Date: Wed, 4 Aug 2021 10:00:57 +0800
Subject: [PATCH] * Fix bug#13973.

---
 module/doc/model.php      | 6 +++++-
 module/testcase/model.php | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/module/doc/model.php b/module/doc/model.php
index 724c3db0e1..40fa4ac83d 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -1267,7 +1267,8 @@ class docModel extends model
         $testReportPairs = $this->dao->select('id')->from(TABLE_TESTREPORT)->where($type)->eq($objectID)->andWhere('deleted')->eq('0')->andWhere($type)->in($userView)->fetchPairs('id');
         if(!empty($testReportPairs)) $testReportIdList = implode(',', $testReportPairs);
 
-        $casePairs = $this->dao->select('id')->from(TABLE_CASE)->where($type)->eq($objectID)->andWhere('deleted')->eq('0')->andWhere($type)->in($userView)->fetchPairs('id');
+        $field     = $type == 'execution' ? 'project' : $type;
+        $casePairs = $this->dao->select('`case`')->from(TABLE_PROJECTCASE)->where($field)->eq($objectID)->andWhere($field)->in($userView)->fetchPairs('case');
         if(!empty($casePairs)) $caseIdList = implode(',', $casePairs);
 
         $idList      = array_keys($docs);
@@ -1280,6 +1281,9 @@ class docModel extends model
 
             $releasePairs = $this->dao->select('id')->from(TABLE_RELEASE)->where('product')->eq($objectID)->andWhere('deleted')->eq('0')->andWhere('product')->in($userView)->fetchPairs('id');
             if(!empty($releasePairs)) $releaseIdList = implode(',', $releasePairs);
+
+            $casePairs = $this->dao->select('id')->from(TABLE_CASE)->where($type)->eq($objectID)->andWhere('deleted')->eq('0')->andWhere($type)->in($userView)->fetchPairs('id');
+            if(!empty($casePairs)) $caseIdList = implode(',', $casePairs);
         }
         elseif($type == 'project')
         {
diff --git a/module/testcase/model.php b/module/testcase/model.php
index da86209aca..567961391e 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -48,7 +48,6 @@ class testcaseModel extends model
             ->setDefault('openedBy', $this->app->user->account)
             ->setDefault('openedDate', $now)
             ->setIF($this->config->systemMode == 'new' and $this->app->openApp == 'project', 'project', $this->session->project)
-            ->setIF($this->config->systemMode == 'new' and $this->app->openApp == 'execution', 'execution', $this->session->execution)
             ->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion((int)$this->post->story))
             ->remove('steps,expects,files,labels,stepType,forceNotReview')
             ->setDefault('story', 0)