* [bug#55664,done,1h] reset reviewedBy and set reviewers color.

This commit is contained in:
liumengyi
2024-11-07 08:58:35 +08:00
committed by 刘刚
parent 0a7595c780
commit c85f574ea6
2 changed files with 4 additions and 3 deletions
+2 -2
View File
@@ -31,9 +31,9 @@ class storyLifeInfo extends wg
'children' => wg(div
(
setClass('row gap-2 flex-wrap'),
array_values(array_map(function($reviewer, $result) use($users, $lang)
array_values(array_map(function($reviewer, $result) use($users, $lang, $story)
{
return !empty($result) ? span(setClass('mr-2'), set::title($lang->story->reviewed), set::style(array('color' => '#cbd0db')), zget($users, $reviewer)) : span(setClass('mr-2'), set::title($lang->story->toBeReviewed), zget($users, $reviewer));
return !empty($result) ? span(setClass('mr-2'), set::title($lang->story->reviewed), $story->status != 'changing' && $story->status != 'draft' ? set::style(array('color' => '#cbd0db')) : null, zget($users, $reviewer)) : span(setClass('mr-2'), set::title($lang->story->toBeReviewed), zget($users, $reviewer));
}, array_keys($reviewers), array_values($reviewers)))
))
);
+2 -1
View File
@@ -4495,7 +4495,8 @@ class storyModel extends model
{
/* When the review result of the changed story is clarify, the status should be changing. */
$isChanged = $oldStory->changedBy ? true : false;
$story->status = $isChanged ? 'changing' : 'draft';
$story->status = $isChanged ? 'changing' : 'draft';
$story->reviewedBy = '';
}
if($result == 'revert')