Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Code for task#66955.

Browse Source
This commit is contained in:
xieqiyu
2022-09-02 09:44:14 +08:00
parent 121e8fc33d
commit 62e9b5aa44
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/model.php
+9 -12
View File
@@ -449,18 +449,6 @@ class storyModel extends model
{
$forceReview = $this->checkForceReview();
$reviewers = '';
foreach($_POST['title'] as $index => $value)
{
if($_POST['title'][$index] and isset($_POST['reviewer'][$index]) and empty($_POST['reviewDitto'][$index])) $reviewers = $_POST['reviewer'][$index] = array_filter($_POST['reviewer'][$index]);
if($_POST['title'][$index] and isset($_POST['reviewer'][$index]) and !empty($_POST['reviewDitto'][$index])) $_POST['reviewer'][$index] = $reviewers;
if($_POST['title'][$index] and empty($_POST['reviewer'][$index]) and $forceReview)
{
dao::$errors[] = $this->lang->story->errorEmptyReviewedBy;
return false;
}
}
$this->loadModel('action');
$branch = (int)$branch;
$productID = (int)$productID;
@@ -499,6 +487,7 @@ class storyModel extends model
$extendFields = $this->getFlowExtendFields();
$data = array();
$reviewers = '';
foreach($stories->title as $i => $title)
{
if(empty($title))
@@ -513,6 +502,14 @@ class storyModel extends model
}
if(empty($stories->reviewer[$i]) and empty($stories->reviewerDitto[$i])) $stories->reviewer[$i] = array();
$reviewers = (isset($stories->reviewDitto[$i])) ? $reviewers : $stories->reviewer[$i];
$stories->reviewer[$i] = $reviewers;
$_POST['reviewer'][$i] = $reviewers;
if(empty($stories->reviewer[$i]) and $forceReview)
{
dao::$errors[] = $this->lang->story->errorEmptyReviewedBy;
return false;
}
$story = new stdclass();
$story->type = $type;
module/task/config.php
+1 -1
View File
@@ -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,';
$config->task->excludeCheckFileds = ',pri,estStartedDitto,deadlineDitto,parent,';
$config->task->datatable = new stdclass();
$config->task->datatable->defaultField = array('id', 'pri', 'name', 'status', 'assignedTo', 'finishedBy', 'estimate', 'consumed', 'left', 'progress', 'deadline', 'actions');