From ebde890513bd829602593dba86d0477d686cb170 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 5 Dec 2019 09:58:47 +0800
Subject: [PATCH]  * finish task #6658.

---
 module/testtask/lang/de.php        | 1 +
 module/testtask/lang/en.php        | 1 +
 module/testtask/lang/fr.php        | 1 +
 module/testtask/lang/zh-cn.php     | 1 +
 module/testtask/model.php          | 1 +
 module/testtask/view/view.html.php | 2 +-
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php
index 4e49d75b51..0611836a7f 100644
--- a/module/testtask/lang/de.php
+++ b/module/testtask/lang/de.php
@@ -78,6 +78,7 @@ $lang->testtask->stepResults    = 'Schritt Ergebnis';
 $lang->testtask->lastRunner     = 'Ausgeführt von';
 $lang->testtask->lastRunDate    = 'Ausgeführt am';
 $lang->testtask->date           = 'Datum';
+$lang->testtask->deleted        = "Deleted";
 
 $lang->testtask->beginAndEnd    = 'Datum';
 $lang->testtask->to             = 'An';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index d4783e6c80..b59791b231 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -78,6 +78,7 @@ $lang->testtask->stepResults    = 'Step Result';
 $lang->testtask->lastRunner     = 'RunBy';
 $lang->testtask->lastRunDate    = 'Last Run';
 $lang->testtask->date           = 'Tested on';;
+$lang->testtask->deleted        = "Deleted";
 
 $lang->testtask->beginAndEnd    = 'Duration';
 $lang->testtask->to             = 'To';
diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php
index 18cf6fb807..11ccf59e64 100644
--- a/module/testtask/lang/fr.php
+++ b/module/testtask/lang/fr.php
@@ -78,6 +78,7 @@ $lang->testtask->stepResults    = 'Etape Résultat';
 $lang->testtask->lastRunner     = 'Joué par';
 $lang->testtask->lastRunDate    = 'Dernier Run';
 $lang->testtask->date           = 'Testé sur';;
+$lang->testtask->deleted        = "Deleted";
 
 $lang->testtask->beginAndEnd    = 'Durée';
 $lang->testtask->to             = 'à';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 7543a350a3..a462bb1193 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -78,6 +78,7 @@ $lang->testtask->stepResults    = '步骤结果';
 $lang->testtask->lastRunner     = '最后执行人';
 $lang->testtask->lastRunDate    = '最后执行时间';
 $lang->testtask->date           = '测试时间';
+$lang->testtask->deleted        = "已删除";
 
 $lang->testtask->beginAndEnd    = '起止时间';
 $lang->testtask->to             = '至';
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 5b01915c26..b28c045f00 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -29,6 +29,7 @@ class testtaskModel extends model
         if($testtask and $this->app->viewType != 'mhtml')
         {
             $testtasks = $this->getProductTasks($productID, 0, 'id_desc', null, array('local', 'totalStatus'));
+            if(!isset($testtasks[$testtask])) $testtasks[$testtask] = $this->getById($testtask);
 
             $selectHtml .= "<div class='btn-group angle-btn'>";
             $selectHtml .= "<div class='btn-group'>";
diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php
index 1bec08eeec..ec522deb9e 100644
--- a/module/testtask/view/view.html.php
+++ b/module/testtask/view/view.html.php
@@ -21,7 +21,7 @@
       <span class='label label-id'><?php echo $task->id;?></span>
       <span class='text' title='<?php echo $task->name;?>'><?php echo $task->name;?></span>
       <?php if($task->deleted):?>
-      <span class='label label-danger'><?php echo $lang->task->deleted;?></span>
+      <span class='label label-danger'><?php echo $lang->testtask->deleted;?></span>
       <?php endif; ?>
     </div>
   </div>