Merge branch 'sprint/189_hufangzhou_22672' into 'sprint/189_package'

* Fix bug #22672.

See merge request easycorp/zentaopms!3522
This commit is contained in:
王怡栋
2022-05-19 07:56:25 +00:00
2 changed files with 4 additions and 2 deletions
+2
View File
@@ -43,6 +43,8 @@ $config->story->list->customCreateFields = 'source,verify,pri,estimate,mail
$config->story->list->customBatchCreateFields = 'plan,spec,source,verify,pri,estimate,review,keywords';
$config->story->list->customBatchEditFields = 'branch,plan,estimate,pri,assignedTo,source,stage,closedBy,closedReason,keywords';
$config->story->list->actionsOpratedParentStory = ',edit,batchcreate,change,review,recall,';
$config->story->custom = new stdclass();
$config->story->custom->createFields = $config->story->list->customCreateFields;
$config->story->custom->batchCreateFields = 'module,plan,spec,pri,estimate,review,%s';
+2 -2
View File
@@ -3741,10 +3741,10 @@ class storyModel extends model
{
$action = strtolower($action);
if($story->parent < 0 and $action != 'edit' and $action != 'batchcreate' and $action != 'change' and $action != 'review') return false;
global $app, $config;
if($story->parent < 0 and strpos($config->story->list->actionsOpratedParentStory, ",$action,") === false) return false;
$story->reviewer = isset($story->reviewer) ? $story->reviewer : array();
$story->notReview = isset($story->notReview) ? $story->notReview : array();