From 63368d9c7d74ea0cb197ff213d9da74c334eec4c Mon Sep 17 00:00:00 2001
From: wyd621 <wyd621@163.com>
Date: Fri, 21 Mar 2014 07:21:36 +0000
Subject: [PATCH]  * fix a bug for export stage.

---
 module/testcase/control.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index 29ad8b9a20..96a26a2599 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -673,10 +673,10 @@ class testcase extends control
                 if(isset($users[$case->openedBy]))                     $case->openedBy      = $users[$case->openedBy];
                 if(isset($users[$case->lastEditedBy]))                 $case->lastEditedBy  = $users[$case->lastEditedBy];
                 if(isset($caseLang->resultList[$case->lastRunResult])) $case->lastRunResult = $caseLang->resultList[$case->lastRunResult];
-                foreach($caseLang->stageList as $stage => $stageName) 
-                {
-                    if(strpos($case->stage, $stage) !== false) $case->stage = str_replace($stage, $stageName, $case->stage);
-                }
+
+                $case->stage = explode(',', $case->stage);
+                foreach($case->stage as $key => $stage) $case->stage[$key] = isset($caseLang->stageList[$stage]) ? $caseLang->stageList[$stage] : $stage;
+                $case->stage = join("\n", $case->stage);
 
                 $case->openedDate     = substr($case->openedDate, 0, 10);
                 $case->lastEditedDate = substr($case->lastEditedDate, 0, 10);
@@ -861,8 +861,17 @@ class testcase extends control
                     $case->$field = array_search($cellValue, $modules);
                 }
                 elseif(in_array($field, $caseConfig->export->listFields))
-                {   
-                    $case->$field = array_search($cellValue, $caseLang->{$field . 'List'});
+                {
+                    if($field == 'stage')
+                    {
+                        $stages = explode("\n", $cellValue);
+                        foreach($stages as $stage) $case->stage[] = array_search($stage, $caseLang->{$field . 'List'});
+                        $case->stage = join(',', $case->stage);
+                    }
+                    else
+                    {
+                        $case->$field = array_search($cellValue, $caseLang->{$field . 'List'});
+                    }
                 }
                 elseif($field != 'stepDesc' and $field != 'stepExpect')
                 {