From 9469cb457dd5e1ae91d87aad746dd07a942044bf Mon Sep 17 00:00:00 2001
From: wyd621 <wyd621@163.com>
Date: Tue, 23 Jul 2013 08:41:28 +0800
Subject: [PATCH]  * finish task #1593.

---
 module/testcase/config.php           |  2 +-
 module/testcase/control.php          | 13 +++++++------
 module/testcase/lang/en.php          |  1 +
 module/testcase/lang/zh-cn.php       |  1 +
 module/testcase/view/browse.html.php |  2 ++
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/module/testcase/config.php b/module/testcase/config.php
index b0703f016b..bdba18a54a 100644
--- a/module/testcase/config.php
+++ b/module/testcase/config.php
@@ -17,7 +17,7 @@ $config->testcase->editor->view = array('id' => 'comment', 'tools' => 'simpleToo
 $config->testcase->exportFields = '
     id, product, module, story,
     title, precondition, stepDesc, stepExpect, keywords,
-    pri, type, stage, status, frequency,
+    pri, type, stage, status, lastRunResult, frequency,
     openedBy, openedDate, lastEditedBy, lastEditedDate, 
     version,linkCase';
 
diff --git a/module/testcase/control.php b/module/testcase/control.php
index d61b0f39aa..905e399212 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -629,12 +629,13 @@ class testcase extends control
                 if(isset($relatedModules[$case->module])) $case->module  = $relatedModules[$case->module];
                 if(isset($relatedStories[$case->story]))  $case->story   = $relatedStories[$case->story];
 
-                if(isset($caseLang->priList[$case->pri]))       $case->pri          = $caseLang->priList[$case->pri];
-                if(isset($caseLang->typeList[$case->type]))     $case->type         = $caseLang->typeList[$case->type];
-                if(isset($caseLang->stageList[$case->stage]))   $case->stage        = $caseLang->stageList[$case->stage];
-                if(isset($caseLang->statusList[$case->status])) $case->status       = $caseLang->statusList[$case->status];
-                if(isset($users[$case->openedBy]))              $case->openedBy     = $users[$case->openedBy];
-                if(isset($users[$case->lastEditedBy]))          $case->lastEditedBy = $users[$case->lastEditedBy];
+                if(isset($caseLang->priList[$case->pri]))              $case->pri           = $caseLang->priList[$case->pri];
+                if(isset($caseLang->typeList[$case->type]))            $case->type          = $caseLang->typeList[$case->type];
+                if(isset($caseLang->stageList[$case->stage]))          $case->stage         = $caseLang->stageList[$case->stage];
+                if(isset($caseLang->statusList[$case->status]))        $case->status        = $caseLang->statusList[$case->status];
+                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];
 
                 $case->openedDate     = substr($case->openedDate, 0, 10);
                 $case->lastEditedDate = substr($case->lastEditedDate, 0, 10);
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 9e49cfa96c..1ed08e1826 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -60,6 +60,7 @@ $lang->testcase->batchEdit          = "Batch edit";
 $lang->testcase->delete             = "Delete";
 $lang->testcase->browse             = "Browse";
 $lang->testcase->import             = "Import";
+$lang->testcase->exportTemplet      = "Export templet";
 $lang->testcase->export             = "Export";
 $lang->testcase->confirmStoryChange = 'Confirm story change';
 
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 930f5cba48..c31c53f20d 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -60,6 +60,7 @@ $lang->testcase->batchEdit          =  "批量编辑 ";
 $lang->testcase->delete             = "删除";
 $lang->testcase->browse             = "用例列表";
 $lang->testcase->import             = "导入用例";
+$lang->testcase->exportTemplet      = "导出模板";
 $lang->testcase->export             = "导出";
 $lang->testcase->confirmStoryChange = '确认需求变动';
 
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 90654f6f78..aaa4b064f2 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -30,6 +30,8 @@ js::set('moduleID'  , $moduleID);
     ?>
   </div>
   <div class='f-right'>
+    <?php common::printIcon('testcase', 'import', "productID=$productID", '', 'button', 'export', '', 'export');?>
+    <?php common::printIcon('testcase', 'exportTemplet', "productID=$productID", '', 'button', 'export', '', 'export');?>
     <?php if($browseType != 'needconfirm') common::printIcon('testcase', 'export', "productID=$productID&orderBy=$orderBy"); ?>
     <?php common::printIcon('testcase', 'batchCreate', "productID=$productID&moduleID=$moduleID");?>
     <?php common::printIcon('testcase', 'create', "productID=$productID&moduleID=$moduleID"); ?>