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

Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
holan20180123
2021-05-12 17:00:53 +08:00
parent 49e9302c31 c152100434
commit bfd4d6c323
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/model.php
+4 -2
View File
@@ -186,7 +186,7 @@ class storyModel extends model
*/
public function create($executionID = 0, $bugID = 0, $from = '')
{
if(!$this->post->needNotReview and empty($this->post->reviewedBy))
if(!$this->post->needNotReview and empty(array_filter($_POST['reviewedBy'])))
{
dao::$errors[] = $this->lang->story->errorEmptyReviewedBy;
return false;
@@ -527,7 +527,7 @@ class storyModel extends model
return false;
}
if(!$this->post->needNotReview and empty($this->post->reviewedBy))
if(!$this->post->needNotReview and empty(array_filter($_POST['reviewedBy'])))
{
dao::$errors[] = $this->lang->story->errorEmptyReviewedBy;
return false;
@@ -540,6 +540,7 @@ class storyModel extends model
$story = fixer::input('post')
->callFunc('title', 'trim')
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('reviewedBy', '')
->add('lastEditedDate', $now)
->setIF($specChanged, 'version', $oldStory->version + 1)
->setIF($specChanged and $oldStory->status == 'active' and $this->post->needNotReview == false, 'status', 'changed')
@@ -550,6 +551,7 @@ class storyModel extends model
->setIF($specChanged and $oldStory->reviewedBy, 'reviewedDate', '0000-00-00')
->setIF($specChanged and $oldStory->closedBy, 'closedDate', '0000-00-00')
->stripTags($this->config->story->editor->change['id'], $this->config->allowedTags)
->join('reviewedBy', ',')
->remove('files,labels,comment,needNotReview,uid')
->get();
if($specChanged and $story->status == 'active' and $this->checkForceReview()) $story->status = 'changed';