From 65d8752b5eba626ec13e673d480081437a9fd156 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 29 Mar 2018 15:39:53 +0800
Subject: [PATCH]  * fix for import case in testsuite.

---
 module/common/model.php    | 1 -
 module/testsuite/model.php | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 8f3a86d4b6..0efd93af30 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -922,7 +922,6 @@ class commonModel extends model
         $queryCondition = $this->session->$queryCondition;
         $orderBy = $type . 'OrderBy';
         $orderBy = $this->session->$orderBy;
-        $orderBy = str_replace('`left`', 'left', $orderBy); // process the `left` to left.
 
         if(empty($queryCondition) or $this->session->$typeOnlyCondition)
         {
diff --git a/module/testsuite/model.php b/module/testsuite/model.php
index 1aab5b1ed9..0f4f902ee6 100644
--- a/module/testsuite/model.php
+++ b/module/testsuite/model.php
@@ -688,8 +688,8 @@ class testsuiteModel extends model
                             if($stepData->type == 'step')  $parentStepID = 0;
                         }
                     }
-                    $oldCase->steps  = $this->joinStep($oldStep);
-                    $caseData->steps = $this->joinStep($steps);
+                    $oldCase->steps  = $this->testcase->joinStep($oldStep);
+                    $caseData->steps = $this->testcase->joinStep($steps);
                     $changes  = common::createChanges($oldCase, $caseData);
                     $actionID = $this->action->create('case', $caseID, 'Edited');
                     $this->action->logHistory($actionID, $changes);