* code for task #72759, #72758.

This commit is contained in:
wangyidong
2022-10-18 13:45:12 +08:00
parent 6c5ae13ce7
commit dc45796862
3 changed files with 15 additions and 5 deletions
+9 -1
View File
@@ -166,6 +166,10 @@ class story extends control
}
$actionID = $this->action->create('story', $storyID, $action, '', $extra);
/* Record submit review action. */
$story = $this->dao->findById((int)$storyID)->from(TABLE_STORY)->fetch();
if($story->status == 'reviewing') $this->action->create('story', $storyID, 'submitReview');
if($objectID != 0)
{
$object = $this->dao->findById((int)$objectID)->from(TABLE_PROJECT)->fetch();
@@ -1153,6 +1157,10 @@ class story extends control
$action = !empty($changes) ? 'Changed' : 'Commented';
$actionID = $this->action->create('story', $storyID, $action, $this->post->comment);
$this->action->logHistory($actionID, $changes);
/* Record submit review action. */
$story = $this->dao->findById((int)$storyID)->from(TABLE_STORY)->fetch();
if($story->status == 'reviewing') $this->action->create('story', $storyID, 'submitReview');
}
$this->executeHooks($storyID);
@@ -1341,7 +1349,7 @@ class story extends control
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
->where('t1.product')->eq($product->id)
->andWhere('t2.type')->eq('project')
->fetch('model');
->fetch('model');
if($projectModel === 'waterfall')
{