From 087c4a37b1a6cf6316d2d9700453dbc9a3b23614 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Sun, 14 Aug 2022 16:16:40 +0800
Subject: [PATCH] * Code for lite story export.

---
 extension/lite/story/ext/config/lite.php | 2 +-
 module/port/control.php                  | 4 ++++
 module/port/model.php                    | 5 +++--
 module/testcase/config.php               | 1 +
 module/testcase/view/showimport.html.php | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/extension/lite/story/ext/config/lite.php b/extension/lite/story/ext/config/lite.php
index 25b7dc223f..642eaa16fc 100644
--- a/extension/lite/story/ext/config/lite.php
+++ b/extension/lite/story/ext/config/lite.php
@@ -1,5 +1,5 @@
 <?php
-$config->story->list->exportFields = '
+$config->story->exportFields = '
     id, module, title, spec, keywords,
     pri, estimate, status,
     openedBy, openedDate, assignedTo, assignedDate, mailto,
diff --git a/module/port/control.php b/module/port/control.php
index c30c601b0a..bc8edac653 100644
--- a/module/port/control.php
+++ b/module/port/control.php
@@ -144,6 +144,10 @@ class port extends control
     {
         $filter = '';
         if($model == 'task') $filter = 'estimate';
+        if($model == 'story')
+        {
+            if($this->session->storyType) $this->loadModel('story')->replaceUserRequirementLang();
+        }
 
         $this->loadModel($model);
         $importFields = !empty($_SESSION[$model . 'TemplateFields']) ? $_SESSION[$model . 'TemplateFields'] : $this->config->$model->templateFields;
diff --git a/module/port/model.php b/module/port/model.php
index 7bcbfdf171..f9849385ba 100644
--- a/module/port/model.php
+++ b/module/port/model.php
@@ -760,8 +760,9 @@ class portModel extends model
         }
         elseif($queryCondition)
         {
-            $selectKey = 't1.id';
-            if(strpos($queryCondition, "FROM `{$this->config->db->prefix}_$model` AS t1") == false) $selectKey = 't2.id';
+            $selectKey = 'id';
+            if(strpos($queryCondition, "FROM `{$this->config->db->prefix}_$model` AS t1") == false) $selectKey = 't1.id';
+            if(strpos($queryCondition, "FROM `{$this->config->db->prefix}_$model` AS t2") == false) $selectKey = 't2.id';
 
             $stmt = $this->dbh->query($queryCondition . ($this->post->exportType == 'selected' ? " AND $selectKey IN({$this->cookie->checkedItem})" : ''));
             while($row = $stmt->fetch()) $modelDatas[$row->id] = $row;
diff --git a/module/testcase/config.php b/module/testcase/config.php
index bcbd9740b3..e8074d3717 100644
--- a/module/testcase/config.php
+++ b/module/testcase/config.php
@@ -218,6 +218,7 @@ $config->testcase->datatable->fieldList['results']['width']    = '32';
 $config->testcase->datatable->fieldList['results']['required'] = 'no';
 $config->testcase->datatable->fieldList['results']['sort']     = 'no';
 $config->testcase->datatable->fieldList['results']['name']     = $lang->testcase->results;
+$config->testcase->datatable->fieldList['results']['dataSource'] = array('lang' => 'resultList');
 
 $config->testcase->datatable->fieldList['stepNumber']['title']    = 'S';
 $config->testcase->datatable->fieldList['stepNumber']['fixed']    = 'no';
diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index dc44da2ec5..5627391e48 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -44,7 +44,7 @@
         <?php include $app->getModuleRoot() . 'port/view/tfoot.html.php';?>
       </tfoot>
     </table>
-    <?php if(!$insert and $dataInsert === '') include $app->getModuleRoot() . 'common/view/noticeimport.html.php';?>
+    <?php if(!$this->session->insert) include $app->getModuleRoot() . 'common/view/noticeimport.html.php';?>
   </form>
 </div>
 <?php include $app->getModuleRoot() . 'port/view/footer.html.php';?>