From d5bdf6d83403ca15b45f81cd80b4b58ccc8147dd Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Tue, 18 Sep 2018 10:25:41 +0800
Subject: [PATCH] * Finish task #4902.

---
 module/story/config.php        | 2 +-
 module/testcase/css/browse.css | 4 ++--
 module/testtask/control.php    | 3 ++-
 www/theme/default/style.css    | 1 -
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/story/config.php b/module/story/config.php
index 7e987e1e30..c326e72761 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -47,7 +47,7 @@ $config->story->custom->batchCreateFields = 'module,plan,spec,pri,estimate,revie
 $config->story->custom->batchEditFields   = 'branch,module,plan,estimate,pri,source,stage,closedBy,closedReason';
 
 $config->story->datatable = new stdclass();
-$config->story->datatable->defaultField = array('id', 'pri', 'title', 'plan', 'assignedTo', 'status', 'stage', 'taskCount', 'bugCount', 'caseCount', 'actions');
+$config->story->datatable->defaultField = array('id', 'pri', 'title', 'plan', 'openedBy', 'assignedTo', 'estimate', 'status', 'stage', 'taskCount', 'actions');
 
 $config->story->datatable->fieldList['id']['title']    = 'idAB';
 $config->story->datatable->fieldList['id']['fixed']    = 'left';
diff --git a/module/testcase/css/browse.css b/module/testcase/css/browse.css
index 604c144172..558c739962 100644
--- a/module/testcase/css/browse.css
+++ b/module/testcase/css/browse.css
@@ -11,10 +11,10 @@
 .dropdown-list > li > a {display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.53846154; color: #141414; white-space: nowrap;}
 .dropdown-list > li > a:hover,
 .dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;}
-.fail span{color:#f00}
-.blocked span{color:#000}
 
 .pl-5px{padding-left:5px;}
+.fail a, .fail a .icon{color:#f00 !important}
+.blocked a, .blocked a .icon{color:#f00 !important}
 
 tbody > tr > td > .btn-icon {margin-right: 3px;}
 tbody > tr > td   .icon-bug {margin-left: -8px;}
diff --git a/module/testtask/control.php b/module/testtask/control.php
index fd07f9f130..6100002858 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -22,7 +22,6 @@ class testtask extends control
     public function __construct($moduleName = '', $methodName = '')
     {
         parent::__construct($moduleName, $methodName);
-        $this->loadModel('project');
         $this->loadModel('product');
         $this->view->products = $this->products = $this->product->getPairs('nocode');
         if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "fromModule=testtask")));
@@ -382,6 +381,8 @@ class testtask extends control
     {
         /* Save the session. */
         $this->loadModel('testcase');
+        $this->app->loadLang('project');
+        $this->app->loadLang('task');
         $this->session->set('caseList', $this->app->getURI(true));
 
         /* Get task and product info, set menu. */
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 738796f757..f1b10ba503 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -18,4 +18,3 @@
 .article-content{margin-left: 0px;}
 .body-modal .main-header>h2{font-weight:bold;}
 .timeline > li .timeline-text{white-space: nowrap !important;}
-.table .tablesorter-header-inner{color:#000}