From 0a3be4a998862db6f9f89b88635349d7977dff0c Mon Sep 17 00:00:00 2001
From: wyd621 <wyd621@163.com>
Date: Fri, 2 Aug 2013 08:26:27 +0800
Subject: [PATCH]  * fix a bug for error encode when import csv.

---
 module/common/lang/en.php      | 2 ++
 module/common/lang/zh-cn.php   | 1 +
 module/testcase/control.php    | 8 ++++++--
 module/testcase/lang/en.php    | 2 ++
 module/testcase/lang/zh-cn.php | 2 ++
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index fbf9cb49d2..1fbcb907a2 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -315,6 +315,7 @@ $lang->menugroup->action      = 'admin';
 $lang->menugroup->extension   = 'admin';
 $lang->menugroup->editor      = 'admin';
 $lang->menugroup->mail        = 'admin';
+$lang->menugroup->sso         = 'admin';
 
 /* Error info. */
 $lang->error = new stdclass();
@@ -335,6 +336,7 @@ $lang->error->account         = "『%s』should be a valid account.";
 $lang->error->passwordsame    = "Two passwords must be the same";
 $lang->error->passwordrule    = "Password should more than six letters.";
 $lang->error->accessDenied    = 'No purview';
+$lang->error->noData          = 'No data';
 
 /* Pager. */
 $lang->pager = new stdclass();
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 214a45361e..66f7d8e9ec 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -336,6 +336,7 @@ $lang->error->account         = "『%s』应当为合法的用户名。";
 $lang->error->passwordsame    = "两次密码应当相等。";
 $lang->error->passwordrule    = "密码应该符合规则，长度至少为六位。";
 $lang->error->accessDenied    = '您没有访问权限';
+$lang->error->noData          = '没有数据';
 
 /* 分页信息。*/
 $lang->pager = new stdclass();
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 6f0cdd7d31..c472c3d706 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -805,6 +805,11 @@ class testcase extends control
             if(!$field) continue;
             $columnKey[] = $field;
         }
+        if(empty($columnKey))
+        {
+            echo js::alert($this->lang->testcase->errorEncode);
+            die(js::locate(inlink('browse', "productID=$productID")));
+        }
 
         $row = 1;
         $endField = $field;
@@ -856,7 +861,6 @@ class testcase extends control
                 {
                     $case->$field = $cellValue;
                 }
-
                 else
                 {
                     $steps    = explode("\n", $cellValue);
@@ -902,7 +906,7 @@ class testcase extends control
 
         if(empty($caseData))
         {
-            echo js::alert($this->lang->excel->noData);
+            echo js::alert($this->lang->error->noData);
             die(js::locate($this->createLink('testcase', 'browse')));
         }
 
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 2db894b887..da4c2833f2 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -155,3 +155,5 @@ $lang->testcase->resultList['blocked'] = 'Blocked';
 
 $lang->testcase->buttonEdit   = 'Edit';
 $lang->testcase->buttonToList = 'Back';
+
+$lang->testcase->errorEncode = 'No data, please select right encode and upload again!';
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 0fb8bb687d..a99ed5e829 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -154,3 +154,5 @@ $lang->testcase->resultList['blocked'] = '阻塞';
 
 $lang->testcase->buttonEdit   = '编辑';
 $lang->testcase->buttonToList = '返回';
+
+$lang->testcase->errorEncode = '无数据，请选择正确的编码重新上传！';