From 67148f302c815e7de0403df1993886fc7841dd60 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Thu, 25 Mar 2010 12:14:12 +0000
Subject: [PATCH]  * adjust the required fields of testtask.

---
 trunk/module/common/lang/zh-cn.php |  2 +-
 trunk/module/testtask/config.php   | 23 ++---------------------
 trunk/module/testtask/model.php    |  4 ++--
 3 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/trunk/module/common/lang/zh-cn.php b/trunk/module/common/lang/zh-cn.php
index 348569b56a..9ef0620815 100644
--- a/trunk/module/common/lang/zh-cn.php
+++ b/trunk/module/common/lang/zh-cn.php
@@ -113,7 +113,7 @@ $lang->build->menu           = $lang->project->menu;
 
 /* QA视图菜单设置。*/
 $lang->bug->menu->product  = '%s';
-$lang->bug->menu->bug      = array('link' => '缺陷管理|bug|browse|productID=%s', 'alias' => 'view,create,edit,resolve,close,active,report', 'subModule' => 'tree');
+$lang->bug->menu->bug      = array('link' => '缺陷管理|bug|browse|productID=%s', 'alias' => 'view,create,edit,resolve,close,activate,report', 'subModule' => 'tree');
 $lang->bug->menu->testcase = array('link' => '用例管理|testcase|browse|productID=%s', 'alias' => 'view,create,edit');
 $lang->bug->menu->testtask = array('link' => '测试任务|testtask|browse|productID=%s');
 
diff --git a/trunk/module/testtask/config.php b/trunk/module/testtask/config.php
index bda420b8a1..1be0640df0 100644
--- a/trunk/module/testtask/config.php
+++ b/trunk/module/testtask/config.php
@@ -1,22 +1,3 @@
 <?php
-global $lang, $app;
-$app->loadLang('testcase');
-$config->testcase->search['module']                   = 'testcase';
-$config->testcase->search['fields']['id']             = $lang->testcase->id;
-$config->testcase->search['fields']['title']          = $lang->testcase->title;
-$config->testcase->search['fields']['module']         = $lang->testcase->module;
-$config->testcase->search['fields']['openedBy']       = $lang->testcase->openedBy;
-$config->testcase->search['fields']['lastEditedBy']   = $lang->testcase->lastEditedBy;
-$config->testcase->search['fields']['status']         = $lang->testcase->status;
-$config->testcase->search['fields']['pri']            = $lang->testcase->pri;
-$config->testcase->search['fields']['type']           = $lang->testcase->type;
-$config->testcase->search['fields']['openedDate']     = $lang->testcase->openedDate;
-$config->testcase->search['fields']['lastEditedDate'] = $lang->testcase->lastEditedDate;
-
-$config->testcase->search['params']['title']        = array('operator' => 'include', 'control' => 'input',  'values' => '');
-$config->testcase->search['params']['module']       = array('operator' => '=',       'control' => 'select', 'values' => '');
-$config->testcase->search['params']['openedBy']     = array('operator' => '=',       'control' => 'select', 'values' => 'users');
-$config->testcase->search['params']['lastEditedBy'] = array('operator' => '=',       'control' => 'select', 'values' => 'users');
-$config->testcase->search['params']['status']       = array('operator' => '=',       'control' => 'select', 'values' => $lang->testcase->statusList);
-$config->testcase->search['params']['pri']          = array('operator' => '=',       'control' => 'select', 'values' => $lang->testcase->priList);
-$config->testcase->search['params']['type']         = array('operator' => '=',       'control' => 'select', 'values' => $lang->testcase->typeList);
+$config->testtask->create->requiredFields = 'project,build,begin,end,name';
+$config->testtask->edit->requiredFields   = 'project,build,begin,end,name';
diff --git a/trunk/module/testtask/model.php b/trunk/module/testtask/model.php
index 8d3dc957f9..c4e2127246 100644
--- a/trunk/module/testtask/model.php
+++ b/trunk/module/testtask/model.php
@@ -43,7 +43,7 @@ class testtaskModel extends model
             ->stripTags('name')
             ->specialChars('desc')
             ->get();
-        $this->dao->insert(TABLE_TESTTASK)->data($task)->autoCheck()->batchcheck('title,project,build', 'notempty')->exec();
+        $this->dao->insert(TABLE_TESTTASK)->data($task)->autoCheck()->batchcheck($this->config->testtask->create->requiredFields, 'notempty')->exec();
         if(!dao::isError()) return $this->dao->lastInsertID();
     }
 
@@ -74,7 +74,7 @@ class testtaskModel extends model
             ->stripTags('name')
             ->specialChars('desc')
             ->get();
-        $this->dao->update(TABLE_TESTTASK)->data($task)->autoCheck()->batchcheck('title,project,build', 'notempty')->where('id')->eq($taskID)->exec();
+        $this->dao->update(TABLE_TESTTASK)->data($task)->autoCheck()->batchcheck($this->config->testtask->edit->requiredFields, 'notempty')->where('id')->eq($taskID)->exec();
     }
 
     /* 删除测试任务信息。*/