From 9dedf90d270e920049fe0a21603786d6aa41ffdf Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 6 Sep 2022 14:20:39 +0800
Subject: [PATCH] * Fix bug#27276,#27280.

---
 module/bug/config.php   | 2 +-
 module/story/config.php | 2 +-
 module/story/model.php  | 2 +-
 module/task/config.php  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/bug/config.php b/module/bug/config.php
index 16f0b25805..ad67ba65e3 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -56,7 +56,7 @@ $config->bug->custom->createFields      = $config->bug->list->customCreateFields
 $config->bug->custom->batchCreateFields = 'project,execution,deadline,steps,type,severity,os,browser,%s';
 $config->bug->custom->batchEditFields   = 'type,severity,pri,assignedTo,deadline,status,resolvedBy,resolution';
 
-$config->bug->excludeCheckFileds = ',severities,oses,browsers,';
+$config->bug->excludeCheckFileds = ',severities,oses,browsers,lanes,regions,executions,projects,';
 
 $config->bug->editor = new stdclass();
 $config->bug->editor->create     = array('id' => 'steps', 'tools' => 'bugTools');
diff --git a/module/story/config.php b/module/story/config.php
index bf58c9dcd4..a494269437 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -50,7 +50,7 @@ $config->story->custom->createFields      = $config->story->list->customCreateFi
 $config->story->custom->batchCreateFields = 'module,plan,spec,pri,estimate,review,%s';
 $config->story->custom->batchEditFields   = 'branch,module,plan,estimate,pri,source,stage,closedBy,closedReason';
 
-$config->story->excludeCheckFileds = ',uploadImage,category,reviewer,reviewDitto,';
+$config->story->excludeCheckFileds = ',uploadImage,category,reviewer,reviewDitto,lanes,regions,';
 
 global $lang, $app;
 $config->story->datatable = new stdclass();
diff --git a/module/story/model.php b/module/story/model.php
index 92f1bdf36a..972b30fc9f 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -498,7 +498,7 @@ class storyModel extends model
             $reviewers = (isset($stories->reviewDitto[$i])) ? $reviewers : $stories->reviewer[$i];
             $stories->reviewer[$i] = $reviewers;
             $_POST['reviewer'][$i] = $reviewers;
-            if(empty($stories->reviewer[$i]) and $forceReview)
+            if(empty(array_filter($stories->reviewer[$i])) and $forceReview)
             {
                 dao::$errors[] = $this->lang->story->errorEmptyReviewedBy;
                 return false;
diff --git a/module/task/config.php b/module/task/config.php
index 116412e098..6a67b81f84 100644
--- a/module/task/config.php
+++ b/module/task/config.php
@@ -48,7 +48,7 @@ $config->task->custom->createFields      = $config->task->customCreateFields;
 $config->task->custom->batchCreateFields = 'module,story,assignedTo,estimate,desc,pri';
 $config->task->custom->batchEditFields   = 'module,assignedTo,status,pri,estimate,record,left';
 
-$config->task->excludeCheckFileds = ',pri,estStartedDitto,deadlineDitto,parent,';
+$config->task->excludeCheckFileds = ',pri,estStartedDitto,deadlineDitto,parent,regions,lanes,';
 
 $config->task->datatable = new stdclass();
 $config->task->datatable->defaultField = array('id', 'pri', 'name', 'status', 'assignedTo', 'finishedBy', 'estimate', 'consumed', 'left', 'progress', 'deadline', 'actions');