diff --git a/module/design/model.php b/module/design/model.php index 0c4879e513..16cfc5346b 100755 --- a/module/design/model.php +++ b/module/design/model.php @@ -23,14 +23,10 @@ class designModel extends model */ public function create(object $design): bool|int { - $project = $this->loadModel('project')->getByID($design->project); - $requiredFields = $this->config->design->create->requiredFields; - if(!empty($project->hasProduct)) $requiredFields .= ',product'; - $design = $this->loadModel('file')->processImgURL($design, 'desc', (string)$this->post->uid); $this->dao->insert(TABLE_DESIGN)->data($design) ->autoCheck() - ->batchCheck($requiredFields, 'notempty') + ->batchCheck($this->config->design->create->requiredFields, 'notempty') ->exec(); if(dao::isError()) return false; diff --git a/module/design/test/model/create.php b/module/design/test/model/create.php index aebb3e4494..39f602fb20 100755 --- a/module/design/test/model/create.php +++ b/module/design/test/model/create.php @@ -30,7 +30,6 @@ cid=1 - 属性project @11 - 属性product @1 - 属性type @DDS -- 创建未关联产品设计第product条的0属性 @『所属产品』不能为空。 - 创建没有类型设计第type条的0属性 @『设计类型』不能为空。 - 创建没有名称设计第name条的0属性 @『设计名称』不能为空。 @@ -48,21 +47,19 @@ $products = array(0, 1); $stories = array(0, 1); $types = array('HLDS', 'DDS', 'DBDS', 'ADS', ''); -$hldsDesign = array('product' => $products[1], 'story' => $stories[0], 'type' => $types[0], 'name' => '概要设计'); -$ddsDesign = array('product' => $products[1], 'story' => $stories[0], 'type' => $types[1], 'name' => '详细设计'); -$dbdsDesign = array('product' => $products[1], 'story' => $stories[0], 'type' => $types[2], 'name' => '数据库设计'); -$adsDesign = array('product' => $products[1], 'story' => $stories[0], 'type' => $types[3], 'name' => '接口设计'); -$storyDesign = array('product' => $products[1], 'story' => $stories[1], 'type' => $types[1], 'name' => '关联需求设计'); -$noProductDesign = array('product' => $products[0], 'story' => $stories[0], 'type' => $types[3], 'name' => '未关联产品设计'); -$noTypeDesign = array('product' => $products[0], 'story' => $stories[0], 'type' => $types[4], 'name' => '没有类型设计'); -$noNameDesign = array('product' => $products[1], 'story' => $stories[0], 'type' => $types[1], 'name' => ''); +$hldsDesign = array('product' => $products[1], 'story' => $stories[0], 'type' => $types[0], 'name' => '概要设计'); +$ddsDesign = array('product' => $products[1], 'story' => $stories[0], 'type' => $types[1], 'name' => '详细设计'); +$dbdsDesign = array('product' => $products[1], 'story' => $stories[0], 'type' => $types[2], 'name' => '数据库设计'); +$adsDesign = array('product' => $products[1], 'story' => $stories[0], 'type' => $types[3], 'name' => '接口设计'); +$storyDesign = array('product' => $products[1], 'story' => $stories[1], 'type' => $types[1], 'name' => '关联需求设计'); +$noTypeDesign = array('product' => $products[0], 'story' => $stories[0], 'type' => $types[4], 'name' => '没有类型设计'); +$noNameDesign = array('product' => $products[1], 'story' => $stories[0], 'type' => $types[1], 'name' => ''); $designTester = new designTest(); -r($designTester->createTest($hldsDesign)) && p('name,project,product,type') && e('概要设计,11,1,HLDS'); // 创建概要设计 -r($designTester->createTest($ddsDesign)) && p('name,project,product,type') && e('详细设计,11,1,DDS'); // 创建详细设计 -r($designTester->createTest($dbdsDesign)) && p('name,project,product,type') && e('数据库设计,11,1,DBDS'); // 创建数据库设计 -r($designTester->createTest($adsDesign)) && p('name,project,product,type') && e('接口设计,11,1,ADS'); // 创建接口设计 -r($designTester->createTest($storyDesign)) && p('name,project,product,type') && e('关联需求设计,11,1,DDS'); // 创建关联需求设计 -r($designTester->createTest($noProductDesign)) && p('product:0') && e('『所属产品』不能为空。'); // 创建未关联产品设计 -r($designTester->createTest($noTypeDesign)) && p('type:0') && e('『设计类型』不能为空。'); // 创建没有类型设计 -r($designTester->createTest($noNameDesign)) && p('name:0') && e('『设计名称』不能为空。'); // 创建没有名称设计 +r($designTester->createTest($hldsDesign)) && p('name,project,product,type') && e('概要设计,11,1,HLDS'); // 创建概要设计 +r($designTester->createTest($ddsDesign)) && p('name,project,product,type') && e('详细设计,11,1,DDS'); // 创建详细设计 +r($designTester->createTest($dbdsDesign)) && p('name,project,product,type') && e('数据库设计,11,1,DBDS'); // 创建数据库设计 +r($designTester->createTest($adsDesign)) && p('name,project,product,type') && e('接口设计,11,1,ADS'); // 创建接口设计 +r($designTester->createTest($storyDesign)) && p('name,project,product,type') && e('关联需求设计,11,1,DDS'); // 创建关联需求设计 +r($designTester->createTest($noTypeDesign)) && p('type:0') && e('『设计类型』不能为空。'); // 创建没有类型设计 +r($designTester->createTest($noNameDesign)) && p('name:0') && e('『设计名称』不能为空。'); // 创建没有名称设计