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

* Fix the bug of story recall change or review.

Browse Source
This commit is contained in:
xieqiyu
2023-11-07 08:16:04 +00:00
parent e4fdd2306e
commit 721f22b43b
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/config/form.php
+1
View File
@@ -161,6 +161,7 @@ $config->story->form->close['closeSync'] = array('type' => 'string', 'req
$config->story->form->submitReview = array();
$config->story->form->submitReview['reviewer'] = array('type' => 'array', 'control' => 'multi-select', 'required' => false, 'default' => '');
$config->story->form->submitReview['reviewedBy'] = array('type' => 'string', 'control' => 'hidden', 'required' => false, 'default' => '');
$config->story->form->submitReview['status'] = array('type' => 'string', 'control' => 'hidden', 'required' => false, 'default' => 'active');
$config->story->form->batchToTask['module'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->story->form->batchToTask['story'] = array('type' => 'int', 'required' => false, 'default' => 0);
module/story/model.php
+1 -4
View File
@@ -1224,9 +1224,6 @@ class storyModel extends model
*/
public function submitReview(int $storyID, object $story): array|false
{
$story->reviewer = array_filter($story->reviewer);
if(empty($story->reviewer)) return false;
$oldStory = $this->dao->findById($storyID)->from(TABLE_STORY)->fetch();
$reviewerList = $this->getReviewerPairs($oldStory->id, $oldStory->version);
$oldStory->reviewer = implode(',', array_keys($reviewerList));
@@ -1241,7 +1238,7 @@ class storyModel extends model
}
$story->reviewer = implode(',', $story->reviewer);
$story->status = ($this->config->systemMode == 'PLM' and $oldStory->type == 'requirement' and $story->status == 'active' and $this->config->vision == 'rnd') ? 'launched' : 'reviewing';
if($story->reviewer) $story->status = ($this->config->systemMode == 'PLM' and $oldStory->type == 'requirement' and $story->status == 'active' and $this->config->vision == 'rnd') ? 'launched' : 'reviewing';
$this->dao->update(TABLE_STORY)->data($story, 'reviewer')->where('id')->in($twinsIdList)->exec();
module/story/tao.php
+1 -1
View File
@@ -1631,7 +1631,7 @@ class storyTao extends storyModel
$canRecall = common::hasPriv('story', 'recall') && $this->isClickable($story, 'recall');
$title = $story->status == 'changing' ? $this->lang->story->recallChange : $this->lang->story->recall;
if(!$canRecall) $title = $this->lang->story->recallTip['actived'];
$actRecall = array('name' => $story->status == 'changing' ? 'recalledchange' : 'recall', 'className' => 'ajax-submit', 'url' => $canRecall ? $recallLink : null, 'hint' => $title, 'disabled' => !$canRecall);
$actRecall = array('name' => $story->status == 'changing' ? 'recalledchange' : 'recall', 'innerClass' => 'ajax-submit', 'url' => $canRecall ? $recallLink : null, 'hint' => $title, 'disabled' => !$canRecall);
/* Change the render order. */
if(!empty($actSubmitreview))