diff --git a/module/execution/model.php b/module/execution/model.php index b0420b1458..d6c346bf09 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -327,6 +327,7 @@ class executionModel extends model ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', helper::now()) ->setDefault('team', substr($this->post->name, 0, 30)) + ->setIF(!isset($_POST['whitelist']), 'whitelist', '') ->setIF($this->config->systemMode == 'new', 'parent', $this->post->project) ->setIF($this->post->acl == 'open', 'whitelist', '') ->join('whitelist', ',') @@ -466,6 +467,7 @@ class executionModel extends model ->setDefault('lastEditedDate', helper::now()) ->setIF(helper::isZeroDate($this->post->begin), 'begin', '') ->setIF(helper::isZeroDate($this->post->end), 'end', '') + ->setIF(!isset($_POST['whitelist']), 'whitelist', '') ->setDefault('team', $this->post->name) ->join('whitelist', ',') ->stripTags($this->config->execution->editor->edit['id'], $this->config->allowedTags) diff --git a/module/project/model.php b/module/project/model.php index 6a7c3a1e6f..c46e9391d6 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -798,6 +798,7 @@ class projectModel extends model ->setIF($this->post->delta == 999, 'days', 0) ->setIF($this->post->acl == 'open', 'whitelist', '') ->setIF($this->post->budget != 0, 'budget', round((float)$this->post->budget, 2)) + ->setIF(!isset($_POST['whitelist']), 'whitelist', '') ->setDefault('openedBy', $this->app->user->account) ->setDefault('openedDate', helper::now()) ->setDefault('team', substr($this->post->name, 0, 30)) @@ -1048,6 +1049,7 @@ class projectModel extends model ->setIF($this->post->end == '0000-00-00', 'end', '') ->setIF($this->post->future, 'budget', 0) ->setIF($this->post->budget != 0, 'budget', round($this->post->budget, 2)) + ->setIF(!isset($_POST['whitelist']), 'whitelist', '') ->join('whitelist', ',') ->stripTags($this->config->project->editor->edit['id'], $this->config->allowedTags) ->remove('products,branch,plans,delta,future,contactListMenu,teamMembers') diff --git a/test/model/story/getproductstories.php b/test/model/story/getproductstories.php index e67ed97148..174e0f2a2c 100644 --- a/test/model/story/getproductstories.php +++ b/test/model/story/getproductstories.php @@ -12,10 +12,12 @@ pid=1 */ global $tester; -$stories1 = $tester->loadModel('story')->getProductStories(1); +$tester->loadModel('story'); +$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); +a($stories3);die; r(count($stories1)) && p() && e('2'); // 获取需求1可关联的需求数量 r(count($stories2)) && p() && e('2'); // 获取需求2可关联的需求数量 r($stories1) && p('2:type,product') && e('story,1'); // 获取需求1可关联的需求id、product - -r() && p() && e();