From bb2a1286b73dfcee7fb6daab16cd73c1496e9152 Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Thu, 25 Mar 2010 07:45:51 +0000 Subject: [PATCH] * adjust the required fields. --- trunk/module/testcase/config.php | 3 +++ trunk/module/testcase/model.php | 4 ++-- trunk/module/testcase/view/create.html.php | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/trunk/module/testcase/config.php b/trunk/module/testcase/config.php index 04d83b915c..8043feccb9 100644 --- a/trunk/module/testcase/config.php +++ b/trunk/module/testcase/config.php @@ -17,3 +17,6 @@ $config->testcase->search['params']['lastEditedBy'] = array('operator' => '=', $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->testcase->create->requiredFields = 'title'; +$config->testcase->edit->requiredFields = 'title; diff --git a/trunk/module/testcase/model.php b/trunk/module/testcase/model.php index 5beaff0571..d81076c3b1 100644 --- a/trunk/module/testcase/model.php +++ b/trunk/module/testcase/model.php @@ -50,7 +50,7 @@ class testcaseModel extends model ->stripTags('title') ->specialChars('steps') ->get(); - $this->dao->insert(TABLE_CASE)->data($case)->autoCheck()->check('title', 'notempty')->exec(); + $this->dao->insert(TABLE_CASE)->data($case)->autoCheck()->batchCheck($this->config->testcase->create->requiredFields, 'notempty')->exec(); if(!$this->dao->isError()) { $caseID = $this->dao->lastInsertID(); @@ -131,7 +131,7 @@ class testcaseModel extends model ->stripTags('title') ->remove('comment,steps,expects') ->get(); - $this->dao->update(TABLE_CASE)->data($case)->autoCheck()->batchCheck('title,status,type', 'notempty')->where('id')->eq((int)$caseID)->exec(); + $this->dao->update(TABLE_CASE)->data($case)->autoCheck()->batchCheck($this->config->testcase->edit->requiredFields, 'notempty')->where('id')->eq((int)$caseID)->exec(); if(!$this->dao->isError()) { if($stepChanged) diff --git a/trunk/module/testcase/view/create.html.php b/trunk/module/testcase/view/create.html.php index 437fdb1907..e059830e22 100644 --- a/trunk/module/testcase/view/create.html.php +++ b/trunk/module/testcase/view/create.html.php @@ -40,7 +40,7 @@ testcase->title;?> - + testcase->steps;?>