diff --git a/module/program/model.php b/module/program/model.php index 6d4149b771..a041e8bf18 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -598,6 +598,7 @@ class programModel extends model ->setIF($this->post->acl == 'open', 'whitelist', '') ->setIF($this->post->delta == 999, 'end', LONG_TIME) ->setIF($this->post->budget != 0, 'budget', round((float)$this->post->budget, 2)) + ->setIF(!isset($_POST['whitelist']), 'whitelist', '') ->add('type', 'program') ->join('whitelist', ',') ->stripTags($this->config->program->editor->create['id'], $this->config->allowedTags) @@ -684,6 +685,7 @@ class programModel extends model ->setIF($this->post->future, 'budget', 0) ->setIF($this->post->budget != 0, 'budget', round($this->post->budget, 2)) ->setIF(!isset($_POST['budgetUnit']), 'budgetUnit', $oldProgram->budgetUnit) + ->setIF(!isset($_POST['whitelist']), 'whitelist', '') ->join('whitelist', ',') ->stripTags($this->config->program->editor->edit['id'], $this->config->allowedTags) ->remove('uid,delta,future,syncPRJUnit,exchangeRate,contactListMenu') diff --git a/test/model/story/getproductstories.php b/test/model/story/getproductstories.php index 7ba8fac86c..4fe64993b2 100644 --- a/test/model/story/getproductstories.php +++ b/test/model/story/getproductstories.php @@ -17,6 +17,7 @@ $stories1 = $tester->story->getProductStories(1); $stories2 = $tester->story->getProductStories(1, 0, 0, 'all', 'requirement', 'id_asc', true); $stories3 = $tester->story->getProductStories(3, 0, 1830, 'all', 'story', 'id_asc', true); -r(count($stories1)) && p() && e('2'); // 获取需求1可关联的需求数量 -r(count($stories2)) && p() && e('2'); // 获取需求2可关联的需求数量 +r(count($stories1)) && p() && e('2'); // 获取产品1下的所有软件需求数量 +r(count($stories2)) && p() && e('2'); // 获取产品1下的所有用户需求数量 +r(count($stories3)) && p() && e('1'); // 获取产品2可关联的需求数量 r($stories1) && p('2:type,product') && e('story,1'); // 获取需求1可关联的需求id、product