From b3f14e9906daafa801262d3dd47a3bfc877c16ce Mon Sep 17 00:00:00 2001 From: lanzongjun Date: Thu, 3 Nov 2022 09:35:03 +0800 Subject: [PATCH] module requirement check --- module/story/model.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/module/story/model.php b/module/story/model.php index a5a65b8744..f4a01b5191 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -244,12 +244,16 @@ class storyModel extends model } /* check module */ - foreach($this->post->modules as $module) + $requiredFields = "," . $this->config->story->create->requiredFields . ","; + if(strpos($requiredFields, ',module,') !== false) { - if(empty($module)) + foreach($this->post->modules as $module) { - dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->story->module); - return false; + if(empty($module)) + { + dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->story->module); + return false; + } } } @@ -262,9 +266,6 @@ class storyModel extends model $story->plan = $this->post->plans[$key]; if(strpos('draft,reviewing', $story->status) !== false) $story->stage = $this->post->plan > 0 ? 'planned' : 'wait'; - - $requiredFields = "," . $this->config->story->create->requiredFields . ","; - if($story->type == 'requirement') $requiredFields = str_replace(',plan,', ',', $requiredFields); if(strpos($requiredFields, ',estimate,') !== false) {