* Merge 18.x story.

This commit is contained in:
tanghucheng
2023-11-30 03:30:47 -05:00
parent f8f6bdc8bb
commit e3fe0d3bb9
2 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -1903,7 +1903,7 @@ class storyModel extends model
{
foreach($stories2Link as $id => $story)
{
if($storyType == 'story' and $story->status == 'draft') unset($stories2Link[$id]);
if($storyType == 'story' and $story->status != 'active') unset($stories2Link[$id]);
}
}
+3 -2
View File
@@ -180,6 +180,7 @@ detailHeader
)
);
$statusClass = $story->URChanged ? 'status-changed' : "status-{$story->status}";
detailBody
(
sectionList
@@ -277,8 +278,8 @@ detailBody
set::name($lang->story->status),
span
(
setClass("status-story status-{$story->status}"),
$this->processStatus('story', $story)
setClass("status-story $statusClass"),
$story->URChanged ? $lang->story->URChanged : $this->processStatus('story', $story)
)
),
$story->type == 'requirement' ? null : item